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

Commit 682fce43 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Fix the crashes in am_perf tests" into udc-dev am: f0b858b2 am: 45e466a5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22216141



Change-Id: I027240a2cbc61902f5bcbe8b9efab8f107a51724
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e7712f88 45e466a5

tests/ActivityManagerPerfTests/stub-app/AndroidManifest.xml

+6 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,12 @@ 
     package="com.android.stubs.am">

     package="com.android.stubs.am">





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

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

    <queries>

        <intent>

            <action android:name="com.android.stubs.am.ACTION_BROADCAST_TEST"/>

        </intent>

    </queries>



    <application android:label="Android TestCase">

    <application android:label="Android TestCase">

        <provider android:authorities="@string/authority"

        <provider android:authorities="@string/authority"

             android:name=".TestContentProvider"

             android:name=".TestContentProvider"