diff options
| author | 2019-03-31 21:38:02 -0700 | |
|---|---|---|
| committer | 2019-03-31 21:38:02 -0700 | |
| commit | f076210032c3c7f87d06cf6233971c7313eba534 (patch) | |
| tree | 5aabba8430e11b9b40cb6054202de3e473fa2a7a | |
| parent | f75ba075e4d96dde3fc4c6340a790c7ef64bd116 (diff) | |
| parent | 95c5375a8503bff36a34e8147b2d97747f3da808 (diff) | |
Merge "Move permissions from base to standard manifest"
am: 95c5375a85
Change-Id: Ic15b12fd9656bb60aca616a8610df49e568a80e7
| -rw-r--r-- | packages/NetworkStack/AndroidManifest.xml | 11 | ||||
| -rw-r--r-- | packages/NetworkStack/AndroidManifestBase.xml | 9 |
2 files changed, 11 insertions, 9 deletions
diff --git a/packages/NetworkStack/AndroidManifest.xml b/packages/NetworkStack/AndroidManifest.xml index b0a7923d65f4..9b60dc3e952a 100644 --- a/packages/NetworkStack/AndroidManifest.xml +++ b/packages/NetworkStack/AndroidManifest.xml @@ -20,6 +20,17 @@ package="com.android.networkstack" android:sharedUserId="android.uid.networkstack"> <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" /> + + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> + <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> + <!-- Send latency broadcast as current user --> + <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" /> + <uses-permission android:name="android.permission.WAKE_LOCK" /> + <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" /> + <!-- Signature permission defined in NetworkStackStub --> <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" /> <application> diff --git a/packages/NetworkStack/AndroidManifestBase.xml b/packages/NetworkStack/AndroidManifestBase.xml index f69e4b2bb795..69a4da46e088 100644 --- a/packages/NetworkStack/AndroidManifestBase.xml +++ b/packages/NetworkStack/AndroidManifestBase.xml @@ -20,15 +20,6 @@ package="com.android.networkstack" android:versionCode="11" android:versionName="Q-initial"> - <uses-permission android:name="android.permission.INTERNET" /> - <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> - <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" /> - <!-- Send latency broadcast as current user --> - <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" /> - <uses-permission android:name="android.permission.WAKE_LOCK" /> - <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" /> <application android:label="NetworkStack" android:defaultToDeviceProtectedStorage="true" |