diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-04-01 04:20:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-01 04:20:41 +0000 |
| commit | ce949a8bffe9a81782fcf52477d9a81fe1a0cb5f (patch) | |
| tree | 868df48c3e7543db1694c71cb4712851477817b9 | |
| parent | 675d40142a238c31cfde02e62bd2f12df94b94b7 (diff) | |
| parent | 5520e478e87fec276d56af2df462970706f6dbba (diff) | |
Merge "Move permissions from base to standard manifest"
| -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" |