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

Commit cf3dbaea authored by Hyundo Moon's avatar Hyundo Moon Committed by Cherrypicker Worker
Browse files

Add workaround for failing Activity Tests

This change is intended for downstream branches
who has androidx.test.core library older than 1.5.0.

Bug: 260295342
Test: atest BluetoothPbapActivityTest
Change-Id: Ifc9fcce7bb7f74246fede633b14a4d605892d870
(cherry picked from commit 84ab339c)
Merged-In: Ifc9fcce7bb7f74246fede633b14a4d605892d870
parent ae1ade5f
Loading
Loading
Loading
Loading
+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