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

Commit 1e7e2959 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Fix targetSdkVersion for NetworkStack" am: 42b97de9 

am: ba2f3d2f

Change-Id: I7be8a9f1020d56cdf9ac87a47a25cab77d66958e
parents 92600e3f ba2f3d2f

packages/NetworkStack/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.networkstack"

          android:sharedUserId="android.uid.networkstack">

    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />

    <!-- Signature permission defined in NetworkStackStub -->

    <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" />

    <application>

packages/NetworkStack/AndroidManifestBase.xml

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
          package="com.android.networkstack"

          android:versionCode="11"

          android:versionName="Q-initial">

    <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" />

packages/NetworkStack/AndroidManifest_InProcess.xml

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
          package="com.android.networkstack.inprocess"

          android:sharedUserId="android.uid.system"

          android:process="system">

    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />

    <application>

        <service android:name="com.android.server.NetworkStackService" android:process="system">

            <intent-filter>