Merge changes from topic "customized_dhcp_options" am: 2e86fd1b9b am: 1c09d1c04d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1534304
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2af2287bec3b9df316578c2a52c662a69db1fb85
diff --git a/Android.bp b/Android.bp
index 951b160..409b8d1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -88,7 +88,7 @@
libs: ["unsupportedappusage"],
static_libs: [
"androidx.annotation_annotation",
- "netd_aidl_interface-unstable-java",
+ "netd_aidl_interface-java",
"netlink-client",
"networkstack-client",
"net-utils-framework-common",
@@ -114,6 +114,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
@@ -180,6 +181,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
@@ -187,7 +189,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
@@ -199,6 +202,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/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp
index 2660237..d20e5b2 100644
--- a/common/networkstackclient/Android.bp
+++ b/common/networkstackclient/Android.bp
@@ -149,8 +149,8 @@
"src/android/net/shared/**/*.java",
],
static_libs: [
- "ipmemorystore-aidl-interfaces-unstable-java",
- "networkstack-aidl-interfaces-unstable-java",
+ "ipmemorystore-aidl-interfaces-java",
+ "networkstack-aidl-interfaces-java",
],
visibility: [
"//frameworks/base/packages/Tethering",
diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp
index 833b7d9..874a29e 100644
--- a/tests/integration/Android.bp
+++ b/tests/integration/Android.bp
@@ -83,6 +83,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 17716f7..eb52f92 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -54,6 +54,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