diff options
| author | 2017-01-04 15:34:16 +0000 | |
|---|---|---|
| committer | 2017-01-04 15:34:16 +0000 | |
| commit | 8be80273b88afc85bd106af73bc3f91f6e3c3121 (patch) | |
| tree | 11694e1c040089b1aca5d2e24bb26b13b1355de7 | |
| parent | df49ab557678d177214432b89d76e5f44caf470a (diff) | |
| parent | a169fc349424f6315c6785d66bd66cc1c3a6e337 (diff) | |
Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am: 871beedc6d
am: a169fc3494
Change-Id: I25f816c0ee3df784a02be58a042c505f2c839394
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 1849289f51ef..4df971581945 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 e94bde2f60f7..93ceef46759e 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2049,6 +2049,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 --> <!-- ========================================= --> |