      if (err != 0) {
          ALOGE("native_window_set_buffers_geometry failed: %s (%d)",
 diff --git a/frameworks/av/media/libstagefright/CameraSource.cpp b/frameworks/av/media/libstagefright/CameraSource.cpp
-index c9034e4..94c2578 100644
+index ce045d7..8c01ac2 100644
 --- a/frameworks/av/media/libstagefright/CameraSource.cpp
 +++ b/frameworks/av/media/libstagefright/CameraSource.cpp
 @@ -120,10 +120,16 @@ static int32_t getColorFormat(const char* colorFormat) {

                 mAudioCommands.removeAt(k);
                 break;
             }
@@ -1451,7 +1468,12 @@ static audio_io_handle_t aps_open_input(void *service,
                                         uint32_t *pSamplingRate,
                                         audio_format_t *pFormat,
                                         audio_channel_mask_t *pChannelMask,

 }
 
 static audio_io_handle_t aps_open_input_on_module(void *service,
@@ -1474,7 +1500,12 @@ static audio_io_handle_t aps_open_input_on_module(void *service,
                                                   audio_devices_t *pDevices,
                                                   uint32_t *pSamplingRate,
                                                   audio_format_t *pFormat,
