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

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

Merge "Set NetworkStack targetSdk to 28" 

am: 3e15c9f9

Change-Id: Ic1fe1670f10cb921cf38bcc666142252eb0b749f
parents a8cb41a9 3e15c9f9

packages/CaptivePortalLogin/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:versionCode="10"

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

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

packages/NetworkStack/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
          android:sharedUserId="android.uid.networkstack"

          android:versionCode="10"

          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/NetworkStackPermissionStub/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:sharedUserId="android.uid.networkstack"

    android:versionCode="10"

    android:versionName="Q-initial">

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

    <!--

    This package only exists to define the below permissions, and enforce that they are only

    granted to apps sharing the same signature.