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

Commit f7a485f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move permissions from base to standard manifest"

parents 3bee2ab9 08e96900

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"