diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-03-20 17:29:10 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2019-03-20 17:29:10 +0900 |
| commit | ae1ef49436b70cecc858b96f85dea4d151cdc25f (patch) | |
| tree | f5e727e22c45cce270bd46d7134b10bee73cd454 | |
| parent | 2656b3d4cce7ed5e6e5cc1d608c420267f1ad193 (diff) | |
Fix targetSdkVersion for NetworkStack
targetSdkVersion was set to 28 in aosp/916713, however this was broken
by the manifest refactor in aosp/923338: the targetSdk is not preserved
in the manifest merge.
Test: aapt dump badging shows targetSdkVersion 28
Change-Id: I7d06b141856e96ef011db32094bfc62a8cd1b350
| -rw-r--r-- | packages/NetworkStack/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | packages/NetworkStack/AndroidManifestBase.xml | 1 | ||||
| -rw-r--r-- | packages/NetworkStack/AndroidManifest_InProcess.xml | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/packages/NetworkStack/AndroidManifest.xml b/packages/NetworkStack/AndroidManifest.xml index a90db11df016..b0a7923d65f4 100644 --- a/packages/NetworkStack/AndroidManifest.xml +++ b/packages/NetworkStack/AndroidManifest.xml @@ -19,6 +19,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.networkstack" android:sharedUserId="android.uid.networkstack"> + <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" /> <!-- Signature permission defined in NetworkStackStub --> <uses-permission android:name="android.permission.MAINLINE_NETWORK_STACK" /> <application> @@ -28,4 +29,4 @@ </intent-filter> </service> </application> -</manifest>
\ No newline at end of file +</manifest> diff --git a/packages/NetworkStack/AndroidManifestBase.xml b/packages/NetworkStack/AndroidManifestBase.xml index 621d30c31f98..f69e4b2bb795 100644 --- a/packages/NetworkStack/AndroidManifestBase.xml +++ b/packages/NetworkStack/AndroidManifestBase.xml @@ -20,7 +20,6 @@ package="com.android.networkstack" android:versionCode="11" 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" /> diff --git a/packages/NetworkStack/AndroidManifest_InProcess.xml b/packages/NetworkStack/AndroidManifest_InProcess.xml index 48fcecd2f06d..275cd02a6cc0 100644 --- a/packages/NetworkStack/AndroidManifest_InProcess.xml +++ b/packages/NetworkStack/AndroidManifest_InProcess.xml @@ -20,6 +20,7 @@ package="com.android.networkstack.inprocess" android:sharedUserId="android.uid.system" android:process="system"> + <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" /> <application> <service android:name="com.android.server.NetworkStackService" android:process="system"> <intent-filter> @@ -27,4 +28,4 @@ </intent-filter> </service> </application> -</manifest>
\ No newline at end of file +</manifest> |