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

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

Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support... 

Merge "Revert "Grant shell permissions for Airplane Mode to Shell to support CTS"" am: ec8ebce9 am: af364469 am: 59f5bcf8 am: d8a9174f am: bf5938b6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If19b490afef5f07b872da0b85af9856f5c3873fb
parents 7033685d bf5938b6

data/etc/privapp-permissions-platform.xml

+0 −1
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ applications that come with the platform 
        <permission name="android.permission.MOVE_PACKAGE"/>

        <!-- Needed for test only -->

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

        <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

+0 −3
Original line number Diff line number Diff line
@@ -303,9 +303,6 @@ 
    <!-- Permission needed to restart WiFi Subsystem -->

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



    <!-- 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" />