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

Commit 48ffded2 authored by Karthik Bharadwaj's avatar Karthik Bharadwaj Committed by Android (Google) Code Review
Browse files

Merge "Rename the global mic disable setting" into sc-dev

parents 11c723db 98e579c7

contexthub/1.2/types.hal

+5 −3
Original line number Diff line number Diff line
@@ -35,10 +35,12 @@ enum Setting : @1.1::Setting { 
    AIRPLANE_MODE,



    /**

     * Indicates if the microphone access was turned off globally by the user,

     * in which case audio data cannot be used and propagated by CHRE.

     * Indicates if the microphone access is available for CHRE. Microphone

     * access is disabled if the user has turned off the microphone as a

     * privacy setting, in which case audio data cannot be used and propagated

     * by CHRE.

     */

    GLOBAL_MIC_DISABLE,

    MICROPHONE,

};



struct ContextHubMsg {

contexthub/1.2/vts/functional/VtsHalContexthubV1_2TargetTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -131,10 +131,10 @@ TEST_P(ContexthubHidlTest, TestOnAirplaneModeSettingChanged) { 
    ASSERT_OK(registerCallback_1_2(nullptr));

}



TEST_P(ContexthubHidlTest, TestOnGlobalMicDisableSettingChanged) {

TEST_P(ContexthubHidlTest, TestOnMicrophoneSettingChanged) {

    ASSERT_OK(registerCallback_1_2(new ContexthubCallbackV1_2()));

    hubApi->onSettingChanged_1_2(Setting::GLOBAL_MIC_DISABLE, SettingValue::DISABLED);

    hubApi->onSettingChanged_1_2(Setting::GLOBAL_MIC_DISABLE, SettingValue::ENABLED);

    hubApi->onSettingChanged_1_2(Setting::MICROPHONE, SettingValue::DISABLED);

    hubApi->onSettingChanged_1_2(Setting::MICROPHONE, SettingValue::ENABLED);

    ASSERT_OK(registerCallback_1_2(nullptr));

}