diff options
| author | 2017-03-27 19:16:17 +0000 | |
|---|---|---|
| committer | 2017-03-27 19:16:17 +0000 | |
| commit | 37afaac70d33eb6f7e2bf22c6c98140afea8efa7 (patch) | |
| tree | f648f88e8db60de8db41ff1a4c27f634eb1a155e | |
| parent | 0f3235a167ed8fe43324d10680be521e9a781186 (diff) | |
| parent | a1e206a335f5050618564d2129fbc2bcd0e20730 (diff) | |
Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi."
am: a1e206a335
Change-Id: I71fabdff9deb0f7ba40a545090bd09ddc66994a8
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 870da1dad2c6..20697d410e61 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -87,6 +87,7 @@ package android { field public static final java.lang.String CLEAR_APP_CACHE = "android.permission.CLEAR_APP_CACHE"; field public static final java.lang.String CLEAR_APP_USER_DATA = "android.permission.CLEAR_APP_USER_DATA"; field public static final java.lang.String CONNECTIVITY_INTERNAL = "android.permission.CONNECTIVITY_INTERNAL"; + field public static final java.lang.String CONNECTIVITY_USE_RESTRICTED_NETWORKS = "android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"; field public static final java.lang.String CONTROL_INCALL_EXPERIENCE = "android.permission.CONTROL_INCALL_EXPERIENCE"; field public static final java.lang.String CONTROL_LOCATION_UPDATES = "android.permission.CONTROL_LOCATION_UPDATES"; field public static final java.lang.String CONTROL_VPN = "android.permission.CONTROL_VPN"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 4d2dee5c3287..4a9657edc98a 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1304,7 +1304,7 @@ <permission android:name="android.permission.CONNECTIVITY_INTERNAL" android:protectionLevel="signature|privileged" /> - <!-- Allows an internal user to use restricted Networks. + <!-- @SystemApi Allows an internal user to use restricted Networks. @hide --> <permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS" android:protectionLevel="signature|privileged" /> |