commit fad226abd12435dbcd232f7de396f1a097b2bd5f
author Glenn Kasten <gkasten@google.com> Tue Jul 16 17:19:58 2013 -0700
committer Glenn Kasten <gkasten@google.com> Wed Jul 24 17:49:04 2013 -0700
tree 4e5214f8f5b142239a9583e79032b70330fa7c8e
parent 39a60318dcd78b2cb406d2c7dba57cbe9c99c3e7

Use standard name and type for channel mask

Former name 'channels' was ambiguous with respect to channel count.

Change-Id: I716f792d95a7e0c787d27514ad6e93dbcef8a415

media/libmedia/IAudioFlingerClient.cpp

diff --git a/media/libmedia/IAudioFlingerClient.cpp b/media/libmedia/IAudioFlingerClient.cpp
index 2d1e0f8..84a589a 100644
--- a/media/libmedia/IAudioFlingerClient.cpp
+++ b/media/libmedia/IAudioFlingerClient.cpp
@@ -54,7 +54,7 @@
                     (const AudioSystem::OutputDescriptor *)param2;
             data.writeInt32(desc->samplingRate);
             data.writeInt32(desc->format);
-            data.writeInt32(desc->channels);
+            data.writeInt32(desc->channelMask);
             data.writeInt32(desc->frameCount);
             data.writeInt32(desc->latency);
         }
@@ -84,7 +84,7 @@
             } else if (event != AudioSystem::OUTPUT_CLOSED && event != AudioSystem::INPUT_CLOSED) {
                 desc.samplingRate = data.readInt32();
                 desc.format = data.readInt32();
-                desc.channels = data.readInt32();
+                desc.channelMask = (audio_channel_mask_t) data.readInt32();
                 desc.frameCount = data.readInt32();
                 desc.latency = data.readInt32();
                 param2 = &desc;