diff options
| author | 2019-03-05 07:36:15 -0800 | |
|---|---|---|
| committer | 2019-03-05 07:36:15 -0800 | |
| commit | 06916df886e88a11f2b13c22940e8015a39c184c (patch) | |
| tree | 975ca85adf2c6eb81ad6e79dfb8273abaa7f58c3 | |
| parent | b21765f2f330537ad86c3c4b40517e4afe6c0140 (diff) | |
| parent | 57699540f38191c2bdefb255b4cff70475bebd6e (diff) | |
Merge "Set module min_sdk_version to 28" am: f756dee1b4 am: b936c95bf8
am: 57699540f3
Change-Id: I81b1485dc3b6e8f034aa9695cf4db7487d1da9ba
| -rw-r--r-- | packages/CaptivePortalLogin/Android.bp | 1 | ||||
| -rw-r--r-- | packages/CaptivePortalLogin/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packages/NetworkStack/Android.bp | 1 | ||||
| -rw-r--r-- | packages/NetworkStack/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | packages/NetworkStackPermissionStub/Android.bp | 1 | ||||
| -rw-r--r-- | packages/NetworkStackPermissionStub/AndroidManifest.xml | 2 |
6 files changed, 6 insertions, 3 deletions
diff --git a/packages/CaptivePortalLogin/Android.bp b/packages/CaptivePortalLogin/Android.bp index a71977f8cc6c..bc614e9fc14c 100644 --- a/packages/CaptivePortalLogin/Android.bp +++ b/packages/CaptivePortalLogin/Android.bp @@ -18,6 +18,7 @@ android_app { name: "CaptivePortalLogin", srcs: ["src/**/*.java"], sdk_version: "system_current", + min_sdk_version: "28", certificate: "networkstack", static_libs: [ "androidx.legacy_legacy-support-v4", diff --git a/packages/CaptivePortalLogin/AndroidManifest.xml b/packages/CaptivePortalLogin/AndroidManifest.xml index a5f3b88fef0a..44e0a659212a 100644 --- a/packages/CaptivePortalLogin/AndroidManifest.xml +++ b/packages/CaptivePortalLogin/AndroidManifest.xml @@ -18,7 +18,7 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.captiveportallogin" - android:versionCode="10" + android:versionCode="11" android:versionName="Q-initial"> <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" /> diff --git a/packages/NetworkStack/Android.bp b/packages/NetworkStack/Android.bp index 5f1f26d88171..f210840b976f 100644 --- a/packages/NetworkStack/Android.bp +++ b/packages/NetworkStack/Android.bp @@ -36,6 +36,7 @@ java_library { android_app { name: "NetworkStack", sdk_version: "system_current", + min_sdk_version: "28", certificate: "networkstack", privileged: true, static_libs: [ diff --git a/packages/NetworkStack/AndroidManifest.xml b/packages/NetworkStack/AndroidManifest.xml index 740c573eb914..003f1e59d743 100644 --- a/packages/NetworkStack/AndroidManifest.xml +++ b/packages/NetworkStack/AndroidManifest.xml @@ -19,7 +19,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.networkstack" android:sharedUserId="android.uid.networkstack" - android:versionCode="10" + android:versionCode="11" android:versionName="Q-initial"> <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" /> <uses-permission android:name="android.permission.INTERNET" /> diff --git a/packages/NetworkStackPermissionStub/Android.bp b/packages/NetworkStackPermissionStub/Android.bp index dd70cf56b51b..8cee92e5fe6d 100644 --- a/packages/NetworkStackPermissionStub/Android.bp +++ b/packages/NetworkStackPermissionStub/Android.bp @@ -21,6 +21,7 @@ android_app { // a classes.dex. srcs: ["src/**/*.java"], platform_apis: true, + min_sdk_version: "28", certificate: "networkstack", privileged: true, manifest: "AndroidManifest.xml", diff --git a/packages/NetworkStackPermissionStub/AndroidManifest.xml b/packages/NetworkStackPermissionStub/AndroidManifest.xml index 62bf3de3fb95..e83f0503d280 100644 --- a/packages/NetworkStackPermissionStub/AndroidManifest.xml +++ b/packages/NetworkStackPermissionStub/AndroidManifest.xml @@ -19,7 +19,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.networkstack.permissionstub" android:sharedUserId="android.uid.networkstack" - android:versionCode="10" + android:versionCode="11" android:versionName="Q-initial"> <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" /> <!-- |