Merge "Have DhcpClient transit to StoppedState on lease renew failure."
diff --git a/Android.bp b/Android.bp
index e241b4c..6d84691 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,6 +45,17 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
+// Defaults to enable/disable java targets that depend on
+// NetworkStackNext, which uses development APIs. "enabled" may
+// have a different value depending on the branch.
+java_defaults {
+ name: "NetworkStackNextEnableDefaults",
+ enabled: true,
+}
+// This is a placeholder comment to avoid merge conflicts
+// as the above target may have different "enabled" values
+// depending on the branch
+
java_defaults {
name: "NetworkStackDevApiLevel",
min_sdk_version: "29",
@@ -233,7 +244,11 @@
// The versions of the android library containing network stack code compiled for each SDK variant.
android_library {
name: "NetworkStackApiCurrentLib",
- defaults: ["NetworkStackDevApiLevel", "NetworkStackAndroidLibraryDefaults"],
+ defaults: [
+ "NetworkStackDevApiLevel",
+ "NetworkStackAndroidLibraryDefaults",
+ "NetworkStackNextEnableDefaults",
+ ],
srcs: [
"src/**/*.java",
":statslog-networkstack-java-gen-current"
@@ -302,7 +317,11 @@
// Non-updatable network stack running in the system server process for devices not using the module
android_app {
name: "InProcessNetworkStack",
- defaults: [ "NetworkStackAppDefaults", "NetworkStackDevApiLevel"],
+ defaults: [
+ "NetworkStackAppDefaults",
+ "NetworkStackDevApiLevel",
+ "NetworkStackNextEnableDefaults",
+ ],
static_libs: ["NetworkStackApiCurrentLib"],
certificate: "platform",
manifest: "AndroidManifest_InProcess.xml",
@@ -320,7 +339,11 @@
// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
android_library {
name: "NetworkStackNextManifestBase",
- defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],
+ defaults: [
+ "NetworkStackAppDefaults",
+ "NetworkStackDevApiLevel",
+ "NetworkStackNextEnableDefaults",
+ ],
static_libs: ["NetworkStackApiCurrentLib"],
manifest: "AndroidManifest.xml"
}
@@ -328,7 +351,11 @@
// NetworkStack build targeting the current API release, for testing on in-development SDK
android_app {
name: "NetworkStackNext",
- defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],
+ defaults: [
+ "NetworkStackAppDefaults",
+ "NetworkStackDevApiLevel",
+ "NetworkStackNextEnableDefaults",
+ ],
static_libs: ["NetworkStackNextManifestBase"],
certificate: "networkstack",
manifest: "AndroidManifest_Next.xml",
diff --git a/OWNERS b/OWNERS
index 8cb7492..62c5737 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,8 +1,2 @@
-codewiz@google.com
-jchalard@google.com
-junyulai@google.com
-lorenzo@google.com
-maze@google.com
-reminv@google.com
-satk@google.com
-xiaom@google.com
+set noparent
+file:platform/packages/modules/Connectivity:master:/OWNERS_core_networking
diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp
index 9137c5c..6056ee5 100644
--- a/tests/integration/Android.bp
+++ b/tests/integration/Android.bp
@@ -81,6 +81,7 @@
defaults: [
"NetworkStackIntegrationTestsDefaults",
"NetworkStackIntegrationTestsJniDefaults",
+ "NetworkStackNextEnableDefaults",
],
static_libs: [
"NetworkStackApiCurrentLib",
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index fa054fe..1dba074 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -57,7 +57,7 @@
srcs: [], // TODO: tests that only apply to the current, non-stable API can be added here
test_suites: ["general-tests"],
test_mainline_modules: ["CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"],
- defaults: ["NetworkStackTestsDefaults"],
+ defaults: ["NetworkStackTestsDefaults", "NetworkStackNextEnableDefaults"],
static_libs: ["NetworkStackApiCurrentLib"],
compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit
jarjar_rules: ":NetworkStackJarJarRules",