diff options
| author | Eric Laurent <elaurent@google.com> | 2014-03-26 19:05:55 -0700 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2014-03-26 19:05:55 -0700 |
| commit | 2f8a36fc8df14cba33fa7c5c1c9d5a52f8a133c2 (patch) | |
| tree | 7d46255b2e5a25ca5de3cc756152a3a64121ea6c /services/audiopolicy | |
| parent | 2347c7b0502f5f71d2f0e22d39f1d5a61add3f6b (diff) | |
| download | frameworks_av-2f8a36fc8df14cba33fa7c5c1c9d5a52f8a133c2.zip frameworks_av-2f8a36fc8df14cba33fa7c5c1c9d5a52f8a133c2.tar.gz frameworks_av-2f8a36fc8df14cba33fa7c5c1c9d5a52f8a133c2.tar.bz2 | |
Fix the build
Change-Id: I2169a3d26f4e35e5cfa35a1264175aab6ac4db41
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 8 | ||||
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index d9d7b6e..45f98d2 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -174,7 +174,7 @@ status_t AudioPolicyManager::setDeviceConnectionState(audio_devices_t device, if (audio_is_output_device(device)) { sp<DeviceDescriptor> devDesc = new DeviceDescriptor(device, address, - AUDIO_CHANNEL_NONE); + 0); ssize_t index = mAvailableOutputDevices.indexOf(devDesc); // save a copy of the opened output descriptors before any output is opened or closed @@ -270,7 +270,7 @@ status_t AudioPolicyManager::setDeviceConnectionState(audio_devices_t device, if (audio_is_input_device(device)) { sp<DeviceDescriptor> devDesc = new DeviceDescriptor(device, address, - AUDIO_CHANNEL_NONE); + 0); ssize_t index = mAvailableInputDevices.indexOf(devDesc); switch (state) @@ -332,7 +332,7 @@ audio_policy_dev_state_t AudioPolicyManager::getDeviceConnectionState(audio_devi String8 address = String8(device_address); sp<DeviceDescriptor> devDesc = new DeviceDescriptor(device, String8(device_address), - AUDIO_CHANNEL_NONE); + 0); ssize_t index; DeviceVector *deviceVector; @@ -3834,7 +3834,7 @@ bool AudioPolicyManager::DeviceDescriptor::equals(const sp<DeviceDescriptor>& ot // - have the same channel mask or one device does not specify the channel mask return (mType == other->mType) && (mAddress == "" || other->mAddress == "" || mAddress == other->mAddress) && - (mChannelMask == AUDIO_CHANNEL_NONE || other->mChannelMask == AUDIO_CHANNEL_NONE || + (mChannelMask == 0 || other->mChannelMask == 0 || mChannelMask == other->mChannelMask); } diff --git a/services/audiopolicy/AudioPolicyManager.h b/services/audiopolicy/AudioPolicyManager.h index 0887fcf..8a631ba 100644 --- a/services/audiopolicy/AudioPolicyManager.h +++ b/services/audiopolicy/AudioPolicyManager.h @@ -184,7 +184,7 @@ protected: DeviceDescriptor(audio_devices_t type) : mType(type), mAddress(""), - mChannelMask(AUDIO_CHANNEL_NONE), mId(0) {} + mChannelMask(0), mId(0) {} status_t dump(int fd, int spaces) const; static void dumpHeader(int fd, int spaces); |