Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set NetworkStack targetSdk to 28"

Browse Source 
am: 3e15c9f9ba

Change-Id: Ic1fe1670f10cb921cf38bcc666142252eb0b749f
This commit is contained in:
Remi NGUYEN VAN
2019-02-28 22:52:43 -08:00
committed by android-build-merger
parent a8cb41a94d 3e15c9f9ba
commit 4be31060a2
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/CaptivePortalLogin/AndroidManifest.xml
View File

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

1
packages/NetworkStack/AndroidManifest.xml
View File

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

3
packages/NetworkStackPermissionStub/AndroidManifest.xml
View File

@@ -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.
@@ -36,4 +37,4 @@
android:protectionLevel="signature"/> android:protectionLevel="signature"/>
<application android:name="com.android.server.NetworkStackPermissionStub"/> <application android:name="com.android.server.NetworkStackPermissionStub"/>
</manifest> </manifest>