diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h
index cd7ff92..ae444c3 100644
--- a/include/media/AudioRecord.h
+++ b/include/media/AudioRecord.h
@@ -183,7 +183,7 @@
    /* getters, see constructor and set() */
 
             audio_format_t format() const;
-            int         channelCount() const;
+            uint32_t    channelCount() const;
             size_t      frameCount() const;
             size_t      frameSize() const { return mFrameSize; }
             audio_source_t inputSource() const;
@@ -351,7 +351,6 @@
 
             status_t openRecord_l(uint32_t sampleRate,
                                 audio_format_t format,
-                                audio_channel_mask_t channelMask,
                                 size_t frameCount,
                                 audio_io_handle_t input);
             audio_io_handle_t getInput_l();
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index 61214ec..f1b77ab 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -223,7 +223,7 @@
 
             audio_stream_type_t streamType() const;
             audio_format_t format() const;
-            int         channelCount() const;
+            uint32_t    channelCount() const;
             uint32_t    frameCount() const;
 
     /* Return channelCount * (bit depth per channel / 8).
@@ -493,7 +493,6 @@
             status_t createTrack_l(audio_stream_type_t streamType,
                                  uint32_t sampleRate,
                                  audio_format_t format,
-                                 audio_channel_mask_t channelMask,
                                  size_t frameCount,
                                  audio_output_flags_t flags,
                                  const sp<IMemory>& sharedBuffer,