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

Commit a00bf1bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Idc817611,Ic8160375 

* changes:
  Add VTS test for new settings enums
  Add enum value for BT main / scanning toggle states
parents e1cc317a a6b65006

contexthub/aidl/aidl_api/android.hardware.contexthub/current/android/hardware/contexthub/Setting.aidl

+2 −0
Original line number Diff line number Diff line
@@ -39,4 +39,6 @@ enum Setting { 
  WIFI_SCANNING = 3,

  AIRPLANE_MODE = 4,

  MICROPHONE = 5,

  BT_MAIN = 6,

  BT_SCANNING = 7,

}

contexthub/aidl/android/hardware/contexthub/Setting.aidl

+8 −0
Original line number Diff line number Diff line
@@ -39,4 +39,12 @@ enum Setting { 
     * by CHRE.

     */

    MICROPHONE,

    /**

     * The main BT toggle in the Android settings for BT connectivity.

     */

    BT_MAIN,

    /**

     * The "BT scanning" setting for location scans.

     */

    BT_SCANNING,

}

contexthub/aidl/vts/VtsAidlHalContextHubTargetTest.cpp

+8 −0
Original line number Diff line number Diff line
@@ -300,6 +300,14 @@ TEST_P(ContextHubAidl, TestOnMicrophoneSettingChanged) { 
    testSettingChanged(Setting::MICROPHONE);

}



TEST_P(ContextHubAidl, TestOnBtMainSettingChanged) {

    testSettingChanged(Setting::BT_MAIN);

}



TEST_P(ContextHubAidl, TestOnBtScanningSettingChanged) {

    testSettingChanged(Setting::BT_SCANNING);

}



std::vector<std::tuple<std::string, int32_t>> generateContextHubMapping() {

    std::vector<std::tuple<std::string, int32_t>> tuples;

    auto contextHubAidlNames = android::getAidlHalInstanceNames(IContextHub::descriptor);