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

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

Merge changes I0eb0362e,Iec9b579d am: 6c0e8ad6 am: 1e9a56a8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46be3b5cf0ccdd24545f671f09b5cc90aedca9e3
parents d19a5eac 1e9a56a8

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ package android { 
    field public static final String REQUEST_NETWORK_SCORES = "android.permission.REQUEST_NETWORK_SCORES";

    field public static final String REQUEST_NOTIFICATION_ASSISTANT_SERVICE = "android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE";

    field public static final String RESET_PASSWORD = "android.permission.RESET_PASSWORD";

    field public static final String RESTART_WIFI_SUBSYSTEM = "android.permission.RESTART_WIFI_SUBSYSTEM";

    field public static final String RESTORE_RUNTIME_PERMISSIONS = "android.permission.RESTORE_RUNTIME_PERMISSIONS";

    field public static final String RESTRICTED_VR_ACCESS = "android.permission.RESTRICTED_VR_ACCESS";

    field public static final String RETRIEVE_WINDOW_CONTENT = "android.permission.RETRIEVE_WINDOW_CONTENT";

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -1676,6 +1676,12 @@ 
    <permission android:name="android.permission.REQUEST_NETWORK_SCORES"

        android:protectionLevel="signature|setup" />



    <!-- Allows applications to restart the Wi-Fi subsystem.

     @SystemApi

     <p>Not for use by third-party applications. @hide -->

    <permission android:name="android.permission.RESTART_WIFI_SUBSYSTEM"

                android:protectionLevel="signature|setup" />



    <!-- @SystemApi @hide Allows applications to toggle airplane mode.

         <p>Not for use by third-party or privileged applications.

    -->

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -346,6 +346,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
@@ -292,6 +292,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" />