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

Commit 6026ca95 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 

am: 4be31060

Change-Id: I2575c6caaf3438338ab34d26c7900a28e7beac69
parents fcdb1380 4be31060

packages/CaptivePortalLogin/AndroidManifest.xml

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

    android:versionCode="10"

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

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

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

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

packages/NetworkStack/AndroidManifest.xml

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

          android:sharedUserId="android.uid.networkstack"

          android:versionCode="10"

          android:versionCode="10"

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

packages/NetworkStackPermissionStub/AndroidManifest.xml

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

    android:sharedUserId="android.uid.networkstack"

    android:versionCode="10"

    android:versionCode="10"

    android:versionName="Q-initial">

    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

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

    granted to apps sharing the same signature.

    granted to apps sharing the same signature.