commit 2f8a36fc8df14cba33fa7c5c1c9d5a52f8a133c2
author Eric Laurent <elaurent@google.com> Wed Mar 26 19:05:55 2014 -0700
committer Eric Laurent <elaurent@google.com> Wed Mar 26 19:05:55 2014 -0700
tree 7d46255b2e5a25ca5de3cc756152a3a64121ea6c
parent 2347c7b0502f5f71d2f0e22d39f1d5a61add3f6b

Fix the build

Change-Id: I2169a3d26f4e35e5cfa35a1264175aab6ac4db41

services/audiopolicy/AudioPolicyManager.cpp

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 @@
     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 @@
     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 @@
     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 @@
     // - 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);
 }