diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-03-29 14:56:34 +0900 |
|---|---|---|
| committer | Chiachang Wang <chiachangwang@google.com> | 2019-04-01 09:54:34 +0800 |
| commit | 5520e478e87fec276d56af2df462970706f6dbba (patch) | |
| tree | 8280021b78e0d1add63f01eadbb96f04ff0bff8a | |
| parent | 9ef550610190a650dddca1dea0df8b579d272b55 (diff) | |
Move permissions from base to standard manifest
Permissions defined in AndroidManifest_Base.xml would be inherited in
AndroidManifest_InProcess.xml and cause issues on svelte builds, since
privileged permissions are not whitelisted for
com.android.networkstack.inprocess.
The network stack running in the system_server process does not need
these permissions anyway since it has system_server permissions.
(clean cherry-pick from Ica63ce586e701b1f2415a97f63ba27cc25e4830a)
Test: flashed, booted crosshatch_svelte-eng, WiFi works
Test: flashed, booted blueline-eng, WiFi works
Fixes: 129485310
Merged-In: Ica63ce586e701b1f2415a97f63ba27cc25e4830a
Change-Id: Ib4b478fb39f43a2fd4221c7d1f1ea51de04e0fba
| -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" |