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

Commit f3c551f4 authored by Etan Cohen's avatar Etan Cohen Committed by Automerger Merge Worker
Browse files

Merge "Grant shell permissions for Airplane Mode to Shell to support CTS" am:... 

Merge "Grant shell permissions for Airplane Mode to Shell to support CTS" am: a8cc70b5 am: d1d3e036 am: c031e12c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a31950f7409d3a907448b05d334f5888fc06cc5
parents a162921b c031e12c

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Diff line number Diff line
@@ -350,6 +350,8 @@ applications that come with the platform 
        <permission name="android.permission.MOUNT_FORMAT_FILESYSTEMS"/>

        <permission name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>

        <permission name="android.permission.MOVE_PACKAGE"/>

        <!-- Needed for test only -->

        <permission name="android.permission.NETWORK_AIRPLANE_MODE"/>

        <permission name="android.permission.OBSERVE_APP_USAGE"/>

        <permission name="android.permission.NETWORK_SCAN"/>

        <permission name="android.permission.PACKAGE_USAGE_STATS" />

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -297,6 +297,9 @@ 
    <!-- Permission needed to test mainline permission module rollback -->

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



    <!-- Permission needed to read wifi network credentials for CtsNetTestCases -->

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



    <!-- Permission needed to read wifi network credentials for CtsNetTestCases -->

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