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

Commit 4e79efc6 authored by Ronish Kalia's avatar Ronish Kalia Committed by Automerger Merge Worker
Browse files

Merge "Revert "[test] fix GoogleBluetoothInstrumentationTests"" am: 5b6e9c33... 

Merge "Revert "[test] fix GoogleBluetoothInstrumentationTests"" am: 5b6e9c33 am: 528f500e am: 58e8371f

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



Change-Id: I429d06dee762c0136dcacab38de2b8328d998c05
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f86756f1 58e8371f

android/app/tests/unit/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ 
         which is needed when building test cases. -->



    <application android:allowBackup="true"

                 android:autoRevokePermissions="disallowed" android:testOnly="true">

                 android:autoRevokePermissions="disallowed">

        <uses-library android:name="android.test.runner" />

        <uses-library android:name="org.apache.http.legacy" android:required="false" />

    </application>

android/app/tests/unit/AndroidTest.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="BluetoothInstrumentationTests.apk" />

        <option name="install-arg" value="-t" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">

        <option name="run-command" value="settings put global ble_scan_always_enabled 0" />

framework/tests/stress/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
    <uses-permission android:name="android.permission.WRITE_SETTINGS" />

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />



    <application android:testOnly="true">

    <application >

        <uses-library android:name="android.test.runner" />

    </application>

    <instrumentation android:name="android.bluetooth.BluetoothTestRunner"

framework/tests/stress/AndroidTest.xml

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">

        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="BluetoothTests.apk" />

        <option name="install-arg" value="-t" />

    </target_preparer>



    <option name="test-suite-tag" value="apct"/>