Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08e96900 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

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.

Test: flashed, booted crosshatch_svelte-eng, WiFi works
Test: flashed, booted blueline-eng, WiFi works
Fixes: 129485310
(clean cherry-pick from aosp/937139)

Change-Id: Ica63ce586e701b1f2415a97f63ba27cc25e4830a
parent f897930d

AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -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>

AndroidManifestBase.xml

+0 −9
Original line number Diff line number Diff line
@@ -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"