Merge "Stop using CaptivePortalData in the shim interfaces." am: ee6648c467 am: 5478c66890
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1598153
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib4b150de012d98b71982c0bec4db3a29f198c0eb
diff --git a/Android.bp b/Android.bp
index b1bce40..b50fee5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -118,6 +118,7 @@
":statslog-networkstack-java-gen"
],
manifest: "AndroidManifestBase.xml",
+ enabled: false, // Disabled in mainline-prod
}
// For API stable, first build the dependencies using jarjar compat rules, then build the sources
@@ -184,6 +185,7 @@
// The InProcessNetworkStack goes together with the PlatformCaptivePortalLogin, which replaces
// the default CaptivePortalLogin.
required: ["PlatformNetworkPermissionConfig", "PlatformCaptivePortalLogin"],
+ enabled: false, // Disabled in mainline-prod
}
// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
@@ -191,7 +193,8 @@
name: "NetworkStackNextManifestBase",
defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],
static_libs: ["NetworkStackApiCurrentLib"],
- manifest: "AndroidManifest.xml"
+ manifest: "AndroidManifest.xml",
+ enabled: false, // Disabled in mainline-prod
}
// NetworkStack build targeting the current API release, for testing on in-development SDK
@@ -203,6 +206,7 @@
manifest: "AndroidManifest_Next.xml",
// The permission configuration *must* be included to ensure security of the device
required: ["NetworkPermissionConfig"],
+ enabled: false, // Disabled in mainline-prod
}
// Updatable network stack for finalized API
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b61c89f..55357a8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,8 +19,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.networkstack"
android:sharedUserId="android.uid.networkstack"
- android:versionCode="300900700"
- android:versionName="r_aml_300900700"
+ android:versionCode="309999900"
+ android:versionName="r_aml_309999900"
>
<!-- Permissions must be defined here, and not in the base manifest, as the network stack
running in the system server process does not need any permission, and having privileged
diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp
index 875b089..2cffc3d 100644
--- a/tests/integration/Android.bp
+++ b/tests/integration/Android.bp
@@ -87,6 +87,7 @@
certificate: "networkstack",
platform_apis: true,
test_suites: ["device-tests"],
+ enabled: false, // Disabled in mainline-prod
}
// The static lib needs to be jarjared by each module so they do not conflict with each other
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index c0c6276..e308b96 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -58,6 +58,7 @@
defaults: ["NetworkStackTestsDefaults"],
static_libs: ["NetworkStackApiCurrentLib"],
compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit
+ enabled: false, // Disabled in mainline-prod
}
// Library containing the unit tests. This is used by the coverage test target to pull in the