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

Commit 92062fb1 authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge "Add workaround for failing Activity Tests" into tm-qpr-dev am: ccbe3cf5 

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



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

android/app/tests/unit/AndroidManifest.xml

+14 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          xmlns:tools="http://schemas.android.com/tools"

          package="com.android.bluetooth.tests">



    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
@@ -57,6 +58,19 @@ 
                 android:autoRevokePermissions="disallowed">

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

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



        <!-- Workaround for *ActivityTest failures (b/260295342) -->

        <activity

            android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity"

            tools:node="merge">

            <intent-filter tools:node="removeAll" />

        </activity>

        <activity

            android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity"

            tools:node="merge">

            <intent-filter tools:node="removeAll" />

        </activity>



    </application>

    <!--

    This declares that this application uses the instrumentation test runner targeting