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

Commit 8c68c6cc authored by Sergey Nikolaienkov's avatar Sergey Nikolaienkov Committed by Automerger Merge Worker
Browse files

Merge "Make Shell require permission for a new CTS test" am: e3548b22 am:... 

Merge "Make Shell require permission for a new CTS test" am: e3548b22 am: f453a23f am: 71f8e0fb

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

Change-Id: I8e36e6ac86d354094f2d0700da8a6f61bac56f5f
parents a4b6ce3b 71f8e0fb

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -214,6 +214,9 @@ 
    <!-- Permission needed to test tcp keepalive offload. -->

    <!-- Permission needed to test tcp keepalive offload. -->

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

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





    <!-- Permission needed for CTS test - UnsupportedErrorDialogTests -->

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



    <!-- Permission needed to run keyguard manager tests in CTS -->

    <!-- Permission needed to run keyguard manager tests in CTS -->

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

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