diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-03-31 21:38:02 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-31 21:38:02 -0700 |
| commit | a4c8a532a46f5af189f696eb7f118d3384d17bce (patch) | |
| tree | 868df48c3e7543db1694c71cb4712851477817b9 | |
| parent | dd159626ae01e6a40d5d06b6d533b7fca8ef9896 (diff) | |
| parent | ce949a8bffe9a81782fcf52477d9a81fe1a0cb5f (diff) | |
Merge "Move permissions from base to standard manifest"
am: 95c5375a85
Change-Id: Ic15b12fd9656bb60aca616a8610df49e568a80e7
| -rw-r--r-- | AndroidManifest.xml | 11 | ||||
| -rw-r--r-- | AndroidManifestBase.xml | 9 |
2 files changed, 11 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b0a7923..9b60dc3 100644 --- a/AndroidManifest.xml +++ b/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/AndroidManifestBase.xml b/AndroidManifestBase.xml index f69e4b2..69a4da4 100644 --- a/AndroidManifestBase.xml +++ b/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" |