Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "New permission - BIND_NETWORK_RECOMMENDATION_SERVICE." am: 871beedc6d

Browse Source 
am: a169fc3494

Change-Id: I25f816c0ee3df784a02be58a042c505f2c839394
This commit is contained in:
Jeremy Joslin
2017-01-04 15:34:16 +00:00
committed by android-build-merger
parent df49ab5576 a169fc3494
commit 8be80273b8
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -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";

5
core/res/AndroidManifest.xml
View File

@@ -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 -->
<!-- ========================================= -->