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

Commit ab3148d1 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Fix targetSdkVersion for NetworkStack"

parents a9451963 d1c539e8

AndroidManifest.xml

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

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.networkstack"

          package="com.android.networkstack"

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

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

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

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

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

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

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

    <application>

    <application>

AndroidManifestBase.xml

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

          package="com.android.networkstack"

          android:versionCode="11"

          android:versionCode="11"

          android:versionName="Q-initial">

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

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

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

AndroidManifest_InProcess.xml

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

          package="com.android.networkstack.inprocess"

          android:sharedUserId="android.uid.system"

          android:sharedUserId="android.uid.system"

          android:process="system">

          android:process="system">

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

    <application>

    <application>

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

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

            <intent-filter>

            <intent-filter>