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

Commit 64593c69 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Defining a new REQUEST_NETWORK_SCORES permission."

parents a9d0cfbc 7231d444

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ package android { 
    field public static final java.lang.String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED";

    field public static final java.lang.String BODY_SENSORS = "android.permission.BODY_SENSORS";

    field public static final java.lang.String BRICK = "android.permission.BRICK";

    field public static final java.lang.String BROADCAST_NETWORK_PRIVILEGED = "android.permission.BROADCAST_NETWORK_PRIVILEGED";

    field public static final deprecated java.lang.String BROADCAST_NETWORK_PRIVILEGED = "android.permission.BROADCAST_NETWORK_PRIVILEGED";

    field public static final java.lang.String BROADCAST_PACKAGE_REMOVED = "android.permission.BROADCAST_PACKAGE_REMOVED";

    field public static final java.lang.String BROADCAST_SMS = "android.permission.BROADCAST_SMS";

    field public static final java.lang.String BROADCAST_STICKY = "android.permission.BROADCAST_STICKY";
@@ -201,6 +201,7 @@ package android { 
    field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS";

    field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";

    field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES";

    field public static final java.lang.String REQUEST_NETWORK_SCORES = "android.permission.REQUEST_NETWORK_SCORES";

    field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";

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

    field public static final java.lang.String REVOKE_RUNTIME_PERMISSIONS = "android.permission.REVOKE_RUNTIME_PERMISSIONS";

core/res/AndroidManifest.xml

+10 −1
Original line number Diff line number Diff line
@@ -1255,6 +1255,12 @@ 
    <permission android:name="android.permission.SCORE_NETWORKS"

        android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows applications to request network

         recommendations and scores from the NetworkScoreService.

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

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

        android:protectionLevel="signature|privileged" />



    <!-- ======================================= -->

    <!-- Permissions for short range, peripheral networks -->

    <!-- ======================================= -->
@@ -2674,7 +2680,10 @@ 
        android:protectionLevel="signature" />



    <!-- @SystemApi Allows an application to broadcast privileged networking requests.

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

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

         @hide

         @deprecated Use {@link android.Manifest.permission#REQUEST_NETWORK_SCORES} instead

    -->

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

        android:protectionLevel="signature|privileged" />