summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeremy Joslin <jjoslin@google.com> 2016-12-28 10:32:46 -0800
committer Jeremy Joslin <jjoslin@google.com> 2017-01-03 14:19:51 -0800
commitb9a61979cc92e0c976802195f021b444ce994e4c (patch)
tree93161271ba881dc664a672293b77494e0bd8d87b
parentf8720b95bedeef8dd7397d3926f19ce7b9eaa7f2 (diff)
New permission - BIND_NETWORK_RECOMMENDATION_SERVICE.
Used to protect exported network recommendation services. Test: Built & ran BUG:33897544 Change-Id: Icfc566275a8d832449f6358e576784199ab0f7b2 Merged-In: I4f163fb965be6a25201bc3ba5e0032e7652c8f20
-rw-r--r--api/system-current.txt1
-rw-r--r--core/res/AndroidManifest.xml5
2 files changed, 6 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index b2f2a3ca43da..aaf371aa8b82 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -40,6 +40,7 @@ package android {
field public static final java.lang.String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";
field public static final java.lang.String BIND_KEYGUARD_APPWIDGET = "android.permission.BIND_KEYGUARD_APPWIDGET";
field public static final java.lang.String BIND_MIDI_DEVICE_SERVICE = "android.permission.BIND_MIDI_DEVICE_SERVICE";
+ field public static final java.lang.String BIND_NETWORK_RECOMMENDATION_SERVICE = "android.permission.BIND_NETWORK_RECOMMENDATION_SERVICE";
field public static final java.lang.String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";
field public static final java.lang.String BIND_NOTIFICATION_LISTENER_SERVICE = "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
field public static final java.lang.String BIND_PRINT_RECOMMENDATION_SERVICE = "android.permission.BIND_PRINT_RECOMMENDATION_SERVICE";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 60cf8109edf1..b7ef3713fc67 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2046,6 +2046,11 @@
<permission android:name="android.permission.RESET_SHORTCUT_MANAGER_THROTTLING"
android:protectionLevel="signature" />
+ <!-- Allows the system to bind to the discovered Network Recommendation Service.
+ @SystemApi @hide -->
+ <permission android:name="android.permission.BIND_NETWORK_RECOMMENDATION_SERVICE"
+ android:protectionLevel="signature" />
+
<!-- ========================================= -->
<!-- Permissions for special development tools -->
<!-- ========================================= -->