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

Commit d5e60b6a authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge changes I91ce09f8,Ia08f1885,I7970a64b,I7399254a,Ib4beaa78, ... am: 98746056 

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



Change-Id: I2840f87c12564abc14879bfc44f7ee3f2c8b7380
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d9aa866f 98746056

TEST_MAPPING

+44 −0
Original line number Diff line number Diff line
@@ -70,6 +70,50 @@ 
    },

    {

      "name" : "net_test_stack_btm"

    },

    {

      "name" : "BluetoothInstrumentationTests",

      "options" : [{

        // b/259422308

        "exclude-filter" : "com.android.bluetooth.opp.BluetoothOppTransferTest#eventHandler_handleMessage_MSG_CONNECT_TIMEOUT"

      }, {

        // b/259422308

        "exclude-filter" : "com.android.bluetooth.opp.BluetoothOppTransferTest#eventHandler_handleMessage_MSG_SHARE_INTERRUPTED_batchFailed"

      }, {

        // b/259422308

        "exclude-filter" : "com.android.bluetooth.opp.BluetoothOppTransferTest#eventHandler_handleMessage_TRANSPORT_ERROR_connectThreadIsNull"

      }, {

        // b/259422308

        "exclude-filter" : "com.android.bluetooth.opp.BluetoothOppTransferTest#onBatchCanceled_checkStatus"

      }, {

        // b/259422308

        "exclude-filter" : "com.android.bluetooth.opp.BluetoothOppUtilityTest#openReceivedFile_fileNotExist"

      }]

    },

    {

      "name" : "GoogleBluetoothInstrumentationTests",

      "options" : [{

        // b/259422308

        "exclude-filter" : "com.android.bluetooth.opp.BluetoothOppTransferTest#eventHandler_handleMessage_MSG_CONNECT_TIMEOUT"

      }, {

        // b/259422308

        "exclude-filter" : "com.android.bluetooth.opp.BluetoothOppTransferTest#eventHandler_handleMessage_MSG_SHARE_INTERRUPTED_batchFailed"

      }, {

        // b/259422308

        "exclude-filter" : "com.android.bluetooth.opp.BluetoothOppTransferTest#eventHandler_handleMessage_TRANSPORT_ERROR_connectThreadIsNull"

      }, {

        // b/259422308

        "exclude-filter" : "com.android.bluetooth.opp.BluetoothOppTransferTest#onBatchCanceled_checkStatus"

      }, {

        // b/259422308

        "exclude-filter" : "com.android.bluetooth.opp.BluetoothOppUtilityTest#openReceivedFile_fileNotExist"

      }]

    },

    {

      "name" : "FrameworkBluetoothTests"

    },

    {

      "name" : "ServiceBluetoothTests"

    }

  ]

}

android/app/tests/unit/AndroidTest.xml

+2 −1
Original line number Diff line number Diff line
@@ -45,9 +45,10 @@ 
        <option name="hidden-api-checks" value="false"/>

    </test>



    <!-- Only run Cts Tests in MTS if the Bluetooth Mainline module is installed. -->

    <!-- Only run if the Bluetooth Mainline module is installed. -->

    <object type="module_controller"

            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="enable" value="true" />

        <option name="mainline-module-package-name" value="com.android.btservices" />

    </object>

</configuration>

android/app/tests/unit/GoogleAndroidTest.xml

+2 −1
Original line number Diff line number Diff line
@@ -44,9 +44,10 @@ 
        <option name="hidden-api-checks" value="false"/>

    </test>



    <!-- Only run Cts Tests in MTS if the Bluetooth Mainline module is installed. -->

    <!-- Only run if the Google Bluetooth Mainline module is installed. -->

    <object type="module_controller"

            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">

        <option name="enable" value="true" />

        <option name="mainline-module-package-name" value="com.google.android.btservices" />

    </object>

</configuration>