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

Merge "Fix targetSdkVersion for NetworkStack"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2019-03-22 07:00:50 +00:00
committed by Gerrit Code Review
parent 419956210a ae1ef49436
commit 42b97de9d3
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/NetworkStack/AndroidManifest.xml
View File

@@ -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>
@@ -28,4 +29,4 @@
</intent-filter> </intent-filter>
</service> </service>
</application> </application>
</manifest> </manifest>

1
packages/NetworkStack/AndroidManifestBase.xml
View File

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

3
packages/NetworkStack/AndroidManifest_InProcess.xml
View File

@@ -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>
@@ -27,4 +28,4 @@
</intent-filter> </intent-filter>
</service> </service>
</application> </application>
</manifest> </manifest>