summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2020-02-17 14:44:59 +0800
committer Chiachang Wang <chiachangwang@google.com> 2020-02-17 14:51:31 +0800
commit3590ccd3fb857c68e4c9cabbde3cd58150c0f85b (patch)
treee37419759de38862c5ddebc0b640cbeeb3fd0409
parent305c7391cc957eba72c5249b56cf8515d4d05e09 (diff)
Add NETWORK_SETTINGS to SystemApi
The permissions are checked by Tethering; mainline modules should be able to do permission checks based on these permissions. Bug: 135411507 Test: m Test: make test-api-stubs-docs-update-current-api \ system-api-stubs-docs-update-current-api Change-Id: Ia617ea56aba18f98371d7dbd546679e0327bfacd
-rw-r--r--api/test-current.txt1
-rw-r--r--core/res/AndroidManifest.xml2
2 files changed, 2 insertions, 1 deletions
diff --git a/api/test-current.txt b/api/test-current.txt
index 0a821e405980..79d29f6e906f 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -15,6 +15,7 @@ package android {
field public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";
field public static final String MANAGE_CRATES = "android.permission.MANAGE_CRATES";
field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";
+ field public static final String NETWORK_SETTINGS = "android.permission.NETWORK_SETTINGS";
field public static final String NETWORK_STACK = "android.permission.NETWORK_STACK";
field public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";
field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index b2047ad819fc..6530036f940c 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1656,7 +1656,7 @@
<!-- Allows Settings and SystemUI to call methods in Networking services
<p>Not for use by third-party or privileged applications.
- @SystemApi
+ @SystemApi @TestApi
@hide This should only be used by Settings and SystemUI.
-->
<permission android:name="android.permission.NETWORK_SETTINGS"