Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c69e7516 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am ee98c240: Merge change I73680cd9 into eclair 

Merge commit 'ee98c240' into eclair-mr2

* commit 'ee98c240':
  Fix 2194140: [Passion] Support Audience chip.
parents e94261b8 ee98c240

include/media/AudioSystem.h

+2 −1
Original line number Diff line number Diff line
@@ -257,11 +257,12 @@ public: 
        DEVICE_IN_WIRED_HEADSET = 0x100000,

        DEVICE_IN_AUX_DIGITAL = 0x200000,

        DEVICE_IN_VOICE_CALL = 0x400000,

        DEVICE_IN_BACK_MIC = 0x800000,

        DEVICE_IN_DEFAULT = 0x80000000,



        DEVICE_IN_ALL = (DEVICE_IN_COMMUNICATION | DEVICE_IN_AMBIENT | DEVICE_IN_BUILTIN_MIC |

                DEVICE_IN_BLUETOOTH_SCO_HEADSET | DEVICE_IN_WIRED_HEADSET | DEVICE_IN_AUX_DIGITAL |

                DEVICE_IN_VOICE_CALL| DEVICE_IN_DEFAULT)

                DEVICE_IN_VOICE_CALL | DEVICE_IN_BACK_MIC | DEVICE_IN_DEFAULT)

    };



    // device connection states used for setDeviceConnectionState()

include/media/mediarecorder.h

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ enum audio_source { 
    AUDIO_SOURCE_VOICE_UPLINK = 2,

    AUDIO_SOURCE_VOICE_DOWNLINK = 3,

    AUDIO_SOURCE_VOICE_CALL = 4,

    AUDIO_SOURCE_MAX = AUDIO_SOURCE_VOICE_CALL,

    AUDIO_SOURCE_CAMCORDER = 5,

    AUDIO_SOURCE_MAX = AUDIO_SOURCE_CAMCORDER,



    AUDIO_SOURCE_LIST_END  // must be last - used to validate audio source type

};