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

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

Merge changes I0eb0362e,Iec9b579d am: 6c0e8ad6 am: 1e9a56a8 am: 59b49254... 

Merge changes I0eb0362e,Iec9b579d am: 6c0e8ad6 am: 1e9a56a8 am: 59b49254 am: 258ae119 am: c70fdcd6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4a28b724d8a1c029468b0eaa1a997b4fd879f08
parents 393d66f5 c70fdcd6

data/etc/privapp-permissions-platform.xml

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

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

packages/Shell/AndroidManifest.xml

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

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



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