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

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

Merge "[WIFI] New permission to control restart of the WiFi subsystem" into sc-dev am: 9ce7fe21 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63589655365fd25c666121653ec62753537cbe1b
parents b8381cef 9ce7fe21

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,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
@@ -1744,6 +1744,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.

    -->