summaryrefslogtreecommitdiffstats
path: root/media/libmedia/IAudioPolicyService.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-01-17 11:32:53 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-17 11:32:53 -0800
commit0696400a6bb9abbed62b3b9c6aa105495dc600a2 (patch)
tree2368d7ccb33fbceb99585839b85420e38e59abf0 /media/libmedia/IAudioPolicyService.cpp
parenta9b21c5a7c24fe14d20372263c0bf5faf3d3e348 (diff)
parentf78aee70d15daf4690de7e7b4983ee68b0d1381d (diff)
downloadframeworks_av-0696400a6bb9abbed62b3b9c6aa105495dc600a2.zip
frameworks_av-0696400a6bb9abbed62b3b9c6aa105495dc600a2.tar.gz
frameworks_av-0696400a6bb9abbed62b3b9c6aa105495dc600a2.tar.bz2
Merge "Use audio_mode_t consistently"
Diffstat (limited to 'media/libmedia/IAudioPolicyService.cpp')
-rw-r--r--media/libmedia/IAudioPolicyService.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp
index 67d9c45..645325b 100644
--- a/media/libmedia/IAudioPolicyService.cpp
+++ b/media/libmedia/IAudioPolicyService.cpp
@@ -91,7 +91,7 @@ public:
return static_cast <audio_policy_dev_state_t>(reply.readInt32());
}
- virtual status_t setPhoneState(int state)
+ virtual status_t setPhoneState(audio_mode_t state)
{
Parcel data, reply;
data.writeInterfaceToken(IAudioPolicyService::getInterfaceDescriptor());
@@ -394,7 +394,7 @@ status_t BnAudioPolicyService::onTransact(
case SET_PHONE_STATE: {
CHECK_INTERFACE(IAudioPolicyService, data, reply);
- reply->writeInt32(static_cast <uint32_t>(setPhoneState(data.readInt32())));
+ reply->writeInt32(static_cast <uint32_t>(setPhoneState((audio_mode_t) data.readInt32())));
return NO_ERROR;
} break;