diff options
| author | 2017-01-04 23:20:17 +0000 | |
|---|---|---|
| committer | 2017-01-04 23:20:17 +0000 | |
| commit | afc31dfe0fd4eb4ad512cdfa24451cefb1a5f94b (patch) | |
| tree | 16aca97c94765e5bdab646a2ce5b89d9ee536f5e | |
| parent | c0177f877288752b3b0a6210a9c9cdac74865d43 (diff) | |
| parent | 195ac875782051390b3730176c43fd94e39ec595 (diff) | |
Merge "Defining a new REQUEST_NETWORK_SCORES permission." am: a54d76a81f am: 84fd1e1120
am: 195ac87578
Change-Id: I1f6de46c521a232c1a218e3e6b50883ea6e150b0
| -rw-r--r-- | api/system-current.txt | 3 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 8f8fb93a0394..a27d9f9e4396 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -63,7 +63,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"; @@ -197,6 +197,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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 0117ae867a86..164af265551b 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1236,6 +1236,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 --> <!-- ======================================= --> @@ -2645,7 +2651,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" /> |