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

Commit eea5b797 authored by Thomas Girardier's avatar Thomas Girardier Committed by Automerger Merge Worker
Browse files

Merge changes I09c31d20,I089837ce am: d7242dba 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2333865



Change-Id: I2b30acda64fb5dd4942e13452941468c6215a067
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1031ea45 d7242dba

android/pandora/server/configs/PtsBotTest.xml

+2 −1
Original line number Diff line number Diff line
@@ -37,13 +37,14 @@ 
        <option name="profile" value="AVRCP" />

        <option name="profile" value="GAP" />

        <option name="profile" value="GATT" />

        <option name="profile" value="HFP/AG" />

        <option name="profile" value="HID/HOS" />

        <option name="profile" value="HOGP" />

        <option name="profile" value="L2CAP/COS" />

        <option name="profile" value="L2CAP/LE" />

        <option name="profile" value="MAP" />

        <option name="profile" value="PBAP/PSE" />

        <option name="profile" value="RFCOMM" />

        <option name="profile" value="L2CAP/COS" />

        <option name="profile" value="SDP" />

        <option name="profile" value="SM" />

    </test>

android/pandora/server/configs/PtsBotTestMts.xml

+2 −0
Original line number Diff line number Diff line
@@ -37,12 +37,14 @@ 
        <option name="profile" value="AVRCP" />

        <option name="profile" value="GAP" />

        <option name="profile" value="GATT" />

        <option name="profile" value="HFP/AG" />

        <option name="profile" value="HID/HOS" />

        <option name="profile" value="HOGP" />

        <option name="profile" value="L2CAP/COS" />

        <option name="profile" value="L2CAP/LE" />

        <option name="profile" value="MAP" />

        <option name="profile" value="PBAP/PSE" />

        <option name="profile" value="RFCOMM" />

        <option name="profile" value="SDP" />

        <option name="profile" value="SM" />

    </test>

android/pandora/server/configs/pts_bot_tests_config.json

+21 −0
Original line number Diff line number Diff line
@@ -225,10 +225,14 @@ 
    "GATT/SR/GAR/BI-18-C",

    "GATT/SR/GAR/BI-19-C",

    "GATT/SR/GAR/BI-21-C",

    "GATT/SR/GAR/BI-36-C",

    "GATT/SR/GAR/BI-38-C",

    "GATT/SR/GAR/BI-42-C",

    "GATT/SR/GAR/BV-01-C",

    "GATT/SR/GAR/BV-03-C",

    "GATT/SR/GAR/BV-04-C",

    "GATT/SR/GAR/BV-05-C",

    "GATT/SR/GAR/BV-09-C",

    "GATT/SR/GAW/BI-02-C",

    "GATT/SR/GAW/BI-03-C",

    "GATT/SR/GAW/BI-05-C",
@@ -650,8 +654,10 @@ 
    "GATT/CL/GAR/BV-03-C",

    "GATT/CL/GAS/BV-01-C",

    "GATT/CL/GAS/BV-03-C",

    "GATT/CL/GAS/BV-05-C",

    "GATT/CL/GAT/BV-01-C",

    "GATT/CL/GAT/BV-02-C",

    "GATT/CL/GAT/BV-03-C",

    "GATT/CL/GAW/BI-05-C",

    "GATT/CL/GAW/BI-06-C",

    "GATT/CL/GAW/BI-12-C",
@@ -661,10 +667,13 @@ 
    "GATT/CL/GAW/BV-06-C",

    "GATT/SR/GAI/BV-01-C",

    "GATT/SR/GAN/BV-01-C",

    "GATT/SR/GAN/BV-02-C",

    "GATT/SR/GAN/BV-02-C_LT2",

    "GATT/SR/GAR/BI-05-C",

    "GATT/SR/GAR/BI-11-C",

    "GATT/SR/GAR/BI-17-C",

    "GATT/SR/GAR/BI-22-C",

    "GATT/SR/GAR/BI-44-C",

    "GATT/SR/GAR/BV-06-C",

    "GATT/SR/GAR/BV-07-C",

    "GATT/SR/GAR/BV-08-C",
@@ -853,6 +862,9 @@ 
    "TSPC_ATT_1_2": true,

    "TSPC_ATT_2_1": true,

    "TSPC_ATT_2_2": true,

    "TSPC_ATT_2_3": true,

    "TSPC_ATT_2_3a": true,

    "TSPC_ATT_2_3b": true,

    "TSPC_ATT_3_1": true,

    "TSPC_ATT_3_2": true,

    "TSPC_ATT_3_3": true,
@@ -881,6 +893,9 @@ 
    "TSPC_ATT_3_27": true,

    "TSPC_ATT_3_28": true,

    "TSPC_ATT_3_29": true,

    "TSPC_ATT_3_30": true,

    "TSPC_ATT_3_31": true,

    "TSPC_ATT_3_32": true,

    "TSPC_ATT_4_1": true,

    "TSPC_ATT_4_2": true,

    "TSPC_ATT_4_3": true,
@@ -909,6 +924,9 @@ 
    "TSPC_ATT_4_27": true,

    "TSPC_ATT_4_28": true,

    "TSPC_ATT_4_29": true,

    "TSPC_ATT_4_31": true,

    "TSPC_ATT_4_32": true,

    "TSPC_ATT_4_33": true,

    "TSPC_ATT_5_1": true,

    "TSPC_ATT_5_2": true,

    "TSPC_ATT_5_3": true,
@@ -1255,6 +1273,7 @@ 
    "TSPC_GATT_3_22": true,

    "TSPC_GATT_3_23": true,

    "TSPC_GATT_3_25": true,

    "TSPC_GATT_3_30": true,

    "TSPC_GATT_4_1": true,

    "TSPC_GATT_4_2": true,

    "TSPC_GATT_4_3": true,
@@ -1278,6 +1297,8 @@ 
    "TSPC_GATT_4_22": true,

    "TSPC_GATT_4_23": true,

    "TSPC_GATT_4_25": true,

    "TSPC_GATT_4_30": true,

    "TSPC_GATT_4_31": true,

    "TSPC_GATT_6_2": true,

    "TSPC_GATT_6_3": true,

    "TSPC_GATT_7_1": true,

android/pandora/server/src/com/android/pandora/Host.kt

+2 −2
Original line number Diff line number Diff line
@@ -120,14 +120,14 @@ class Host( 
    }



    // TODO: b/234892968

    delay(2000L)

    delay(3000L)



    bluetoothAdapter.enable()

    stateFlow.filter { it == BluetoothAdapter.STATE_ON }.first()

  }



  override fun factoryReset(request: Empty, responseObserver: StreamObserver<Empty>) {

    grpcUnary<Empty>(scope, responseObserver, 6) {

    grpcUnary<Empty>(scope, responseObserver, 10) {

      Log.i(TAG, "factoryReset")



      bluetoothAdapter.clearBluetooth()