Merge "Follow-up CL to the change at aosp/1523097." am: eacfd4f49b am: 4cee1ba943
Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/1566861
Change-Id: I49ef2b4eae021493b3dde18a630215ec677a8712
diff --git a/Android.bp b/Android.bp
index dd2d391..44e91bc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,10 +45,6 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
-// Whether to enable the targets in this file that target current SDKs.
-// Set to false in branches like mainline-prod where API classes are too old to build current code.
-enable_current_sdk_targets = true
-
java_defaults {
name: "NetworkStackDevApiLevel",
min_sdk_version: "29",
@@ -57,7 +53,7 @@
java_defaults {
name: "NetworkStackReleaseApiLevel",
- sdk_version: "module_current",
+ sdk_version: "module_31",
min_sdk_version: "29",
target_sdk_version: "31",
libs: [
@@ -132,7 +128,6 @@
// integer so if the next SDK release happens to use that integer, we don't need to rename them.
java_library {
name: "NetworkStackApi31Shims",
- enabled: enable_current_sdk_targets,
defaults: ["NetworkStackShimsDefaults"],
srcs: [
"apishim/31/**/*.java",
@@ -143,7 +138,7 @@
"NetworkStackApi30Shims",
"framework-connectivity",
],
- sdk_version: "module_current",
+ sdk_version: "module_31",
visibility: ["//visibility:private"],
}
@@ -173,7 +168,6 @@
// called directly by the networkstack code.
java_library {
name: "NetworkStackApiCurrentShims",
- enabled: enable_current_sdk_targets,
defaults: ["NetworkStackShimsDefaults"],
static_libs: [
"NetworkStackShimsCommon",
@@ -202,7 +196,7 @@
"NetworkStackApi31Shims",
],
jarjar_rules: "apishim/jarjar-rules-compat.txt",
- sdk_version: "module_current",
+ sdk_version: "module_31",
visibility: [
"//packages/modules/Connectivity/Tethering",
"//packages/modules/Connectivity/tests/cts/net",
@@ -244,7 +238,6 @@
],
static_libs: ["NetworkStackApiCurrentShims"],
manifest: "AndroidManifestBase.xml",
- enabled: enable_current_sdk_targets,
visibility: [
"//frameworks/base/tests/net/integration",
"//packages/modules/Connectivity/Tethering/tests/integration",
@@ -323,7 +316,6 @@
"PlatformNetworkPermissionConfig",
"PlatformCaptivePortalLogin",
],
- enabled: enable_current_sdk_targets,
}
// Pre-merge the AndroidManifest for NetworkStackNext, so that its manifest can be merged on top
@@ -331,8 +323,7 @@
name: "NetworkStackNextManifestBase",
defaults: ["NetworkStackAppDefaults", "NetworkStackDevApiLevel"],
static_libs: ["NetworkStackApiCurrentLib"],
- manifest: "AndroidManifest.xml",
- enabled: enable_current_sdk_targets,
+ manifest: "AndroidManifest.xml"
}
// NetworkStack build targeting the current API release, for testing on in-development SDK
@@ -347,7 +338,6 @@
"NetworkPermissionConfig",
"privapp_whitelist_com.android.networkstack",
],
- enabled: enable_current_sdk_targets,
}
// Updatable network stack for finalized API
diff --git a/TEST_MAPPING b/TEST_MAPPING
index ed6a1a8..2bb0e61 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -40,7 +40,8 @@
// We must specify at least one module here or the tests won't run. Use the same set as CTS
// so in theory the infra would not need to reinstall/reboot devices to run both.
{
- "name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex]"
+ // TODO: add back tethering when it is updatable in this branch
+ "name": "NetworkStackTests[CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex]"
}
],
"mainline-postsubmit": [
diff --git a/apishim/31/com/android/networkstack/apishim/api31/ConnectivityManagerShimImpl.java b/apishim/31/com/android/networkstack/apishim/api31/ConnectivityManagerShimImpl.java
index 201b5d8..46de698 100644
--- a/apishim/31/com/android/networkstack/apishim/api31/ConnectivityManagerShimImpl.java
+++ b/apishim/31/com/android/networkstack/apishim/api31/ConnectivityManagerShimImpl.java
@@ -39,7 +39,6 @@
public class ConnectivityManagerShimImpl
extends com.android.networkstack.apishim.api30.ConnectivityManagerShimImpl {
- @RequiresApi(Build.VERSION_CODES.S)
protected ConnectivityManagerShimImpl(Context context) {
super(context);
}
diff --git a/apishim/31/com/android/networkstack/apishim/api31/NetworkRequestShimImpl.java b/apishim/31/com/android/networkstack/apishim/api31/NetworkRequestShimImpl.java
index 29b2e0f..2dc5d72 100644
--- a/apishim/31/com/android/networkstack/apishim/api31/NetworkRequestShimImpl.java
+++ b/apishim/31/com/android/networkstack/apishim/api31/NetworkRequestShimImpl.java
@@ -36,7 +36,6 @@
@RequiresApi(Build.VERSION_CODES.S)
public class NetworkRequestShimImpl
extends com.android.networkstack.apishim.api30.NetworkRequestShimImpl {
- @RequiresApi(Build.VERSION_CODES.S)
protected NetworkRequestShimImpl() {
super();
}
@@ -59,6 +58,13 @@
}
@Override
+ public NetworkRequest.Builder setIncludeOtherUidNetworks(NetworkRequest.Builder builder,
+ boolean include) {
+ builder.setIncludeOtherUidNetworks(include);
+ return builder;
+ }
+
+ @Override
public NetworkRequest.Builder newBuilder(@NonNull NetworkRequest request) {
return new NetworkRequest.Builder(request);
}
diff --git a/apishim/31/com/android/networkstack/apishim/api31/SettingsShimImpl.java b/apishim/31/com/android/networkstack/apishim/api31/SettingsShimImpl.java
index a7c9fb0..1b5cbae 100644
--- a/apishim/31/com/android/networkstack/apishim/api31/SettingsShimImpl.java
+++ b/apishim/31/com/android/networkstack/apishim/api31/SettingsShimImpl.java
@@ -48,9 +48,7 @@
public boolean checkAndNoteWriteSettingsOperation(@NonNull Context context, int uid,
@NonNull String callingPackage, @Nullable String callingAttributionTag,
boolean throwException) {
- // Since checkAndNoteWriteSettingsOperation with callingAttributionTag (S method) is not
- // available in AOSP, calling R method (same as API 30 shim) temporary.
return Settings.checkAndNoteWriteSettingsOperation(context, uid, callingPackage,
- throwException);
+ callingAttributionTag, throwException);
}
}
diff --git a/apishim/common/com/android/networkstack/apishim/common/NetworkRequestShim.java b/apishim/common/com/android/networkstack/apishim/common/NetworkRequestShim.java
index 7d6d7bf..d07d1ae 100644
--- a/apishim/common/com/android/networkstack/apishim/common/NetworkRequestShim.java
+++ b/apishim/common/com/android/networkstack/apishim/common/NetworkRequestShim.java
@@ -37,6 +37,14 @@
@Nullable Set<Range<Integer>> uids) throws UnsupportedApiLevelException;
/**
+ * See android.net.NetworkRequest.Builder#setIncludeOtherUidNetworks.
+ */
+ default NetworkRequest.Builder setIncludeOtherUidNetworks(NetworkRequest.Builder builder,
+ boolean include) throws UnsupportedApiLevelException {
+ throw new UnsupportedApiLevelException("Not supported before API 31.");
+ }
+
+ /**
* See android.net.NetworkRequest.Builder(NetworkRequest).
* @throws UnsupportedApiLevelException if API is not available in the API level.
*/
diff --git a/lint-baseline-current-lib.xml b/lint-baseline-current-lib.xml
index f7b00f2..e8cfe3e 100644
--- a/lint-baseline-current-lib.xml
+++ b/lint-baseline-current-lib.xml
@@ -3,83 +3,6 @@
<issue
id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"
- errorLine1=" ConnectivityUtils.addressAndPortToString("
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"
- line="1032"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"
- errorLine1=" ConnectivityUtils.addressAndPortToString("
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"
- line="1034"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"
- errorLine1=" ConnectivityUtils.addressAndPortToString("
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"
- line="1087"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"
- errorLine1=" ConnectivityUtils.addressAndPortToString("
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"
- line="1089"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#any`"
- errorLine1=" final boolean haveKeepaliveResponses = CollectionUtils.any(mKeepalivePackets,"
- errorLine2=" ~~~">
- <location
- file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"
- line="1368"
- column="64"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#toIntArray`"
- errorLine1=" CollectionUtils.toIntArray(mDnsReturnCode),"
- errorLine2=" ~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/DataStallDetectionStats.java"
- line="302"
- column="37"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#toLongArray`"
- errorLine1=" CollectionUtils.toLongArray(mDnsTimeStamp),"
- errorLine2=" ~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/DataStallDetectionStats.java"
- line="303"
- column="37"/>
- </issue>
-
- <issue
- id="NewApi"
message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"
errorLine1=" newLp.setNat64Prefix(netlinkLinkProperties.getNat64Prefix());"
errorLine2=" ~~~~~~~~~~~~~~">
@@ -102,50 +25,6 @@
<issue
id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" mStatsBuilder.setIpv4LatencyMicros(ConnectivityUtils.saturatedCast(mIpv4Watch.stop()));"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/IpProvisioningMetrics.java"
- line="74"
- column="66"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" mStatsBuilder.setIpv6LatencyMicros(ConnectivityUtils.saturatedCast(mIpv6Watch.stop()));"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/IpProvisioningMetrics.java"
- line="83"
- column="66"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#isEmpty`"
- errorLine1=" if (isEmpty(mCaptivePortalFallbackSpecs)) {"
- errorLine2=" ~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java"
- line="2279"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#isIPv6ULA`"
- errorLine1=" || isIPv6ULA(address)) {"
- errorLine2=" ~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java"
- line="2447"
- column="24"/>
- </issue>
-
- <issue
- id="NewApi"
message="Call requires API level R (current min is 29): `android.telephony.NetworkRegistrationInfo#getCellIdentity`"
errorLine1=" nri == null ? null : nri.getCellIdentity());"
errorLine2=" ~~~~~~~~~~~~~~~">
@@ -155,48 +34,4 @@
column="46"/>
</issue>
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" int latencyUs = ConnectivityUtils.saturatedCast(durationUs);"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"
- line="198"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" .setRemainingTtlSecs(ConnectivityUtils.saturatedCast(secondsRemaining))"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"
- line="209"
- column="56"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" ConnectivityUtils.saturatedCast(capportData.getByteLimit() / 1000))"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"
- line="212"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" mStatsBuilder.setLatencyMicros(ConnectivityUtils.saturatedCast(mWatch.stop()));"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"
- line="237"
- column="58"/>
- </issue>
-
</issues>
diff --git a/lint-baseline-stable-lib.xml b/lint-baseline-stable-lib.xml
index f7b00f2..e8cfe3e 100644
--- a/lint-baseline-stable-lib.xml
+++ b/lint-baseline-stable-lib.xml
@@ -3,83 +3,6 @@
<issue
id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"
- errorLine1=" ConnectivityUtils.addressAndPortToString("
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"
- line="1032"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"
- errorLine1=" ConnectivityUtils.addressAndPortToString("
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"
- line="1034"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"
- errorLine1=" ConnectivityUtils.addressAndPortToString("
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"
- line="1087"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#addressAndPortToString`"
- errorLine1=" ConnectivityUtils.addressAndPortToString("
- errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"
- line="1089"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#any`"
- errorLine1=" final boolean haveKeepaliveResponses = CollectionUtils.any(mKeepalivePackets,"
- errorLine2=" ~~~">
- <location
- file="packages/modules/NetworkStack/src/android/net/apf/ApfFilter.java"
- line="1368"
- column="64"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#toIntArray`"
- errorLine1=" CollectionUtils.toIntArray(mDnsReturnCode),"
- errorLine2=" ~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/DataStallDetectionStats.java"
- line="302"
- column="37"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#toLongArray`"
- errorLine1=" CollectionUtils.toLongArray(mDnsTimeStamp),"
- errorLine2=" ~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/DataStallDetectionStats.java"
- line="303"
- column="37"/>
- </issue>
-
- <issue
- id="NewApi"
message="Call requires API level R (current min is 29): `android.net.LinkProperties#getNat64Prefix`"
errorLine1=" newLp.setNat64Prefix(netlinkLinkProperties.getNat64Prefix());"
errorLine2=" ~~~~~~~~~~~~~~">
@@ -102,50 +25,6 @@
<issue
id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" mStatsBuilder.setIpv4LatencyMicros(ConnectivityUtils.saturatedCast(mIpv4Watch.stop()));"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/IpProvisioningMetrics.java"
- line="74"
- column="66"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" mStatsBuilder.setIpv6LatencyMicros(ConnectivityUtils.saturatedCast(mIpv6Watch.stop()));"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/IpProvisioningMetrics.java"
- line="83"
- column="66"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.CollectionUtils#isEmpty`"
- errorLine1=" if (isEmpty(mCaptivePortalFallbackSpecs)) {"
- errorLine2=" ~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java"
- line="2279"
- column="13"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#isIPv6ULA`"
- errorLine1=" || isIPv6ULA(address)) {"
- errorLine2=" ~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java"
- line="2447"
- column="24"/>
- </issue>
-
- <issue
- id="NewApi"
message="Call requires API level R (current min is 29): `android.telephony.NetworkRegistrationInfo#getCellIdentity`"
errorLine1=" nri == null ? null : nri.getCellIdentity());"
errorLine2=" ~~~~~~~~~~~~~~~">
@@ -155,48 +34,4 @@
column="46"/>
</issue>
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" int latencyUs = ConnectivityUtils.saturatedCast(durationUs);"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"
- line="198"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" .setRemainingTtlSecs(ConnectivityUtils.saturatedCast(secondsRemaining))"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"
- line="209"
- column="56"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" ConnectivityUtils.saturatedCast(capportData.getByteLimit() / 1000))"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"
- line="212"
- column="43"/>
- </issue>
-
- <issue
- id="NewApi"
- message="Call requires API level 31 (current min is 29): `com.android.net.module.util.ConnectivityUtils#saturatedCast`"
- errorLine1=" mStatsBuilder.setLatencyMicros(ConnectivityUtils.saturatedCast(mWatch.stop()));"
- errorLine2=" ~~~~~~~~~~~~~">
- <location
- file="packages/modules/NetworkStack/src/com/android/networkstack/metrics/NetworkValidationMetrics.java"
- line="237"
- column="58"/>
- </issue>
-
</issues>
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 5a6444f..64da600 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -36,7 +36,10 @@
"android.test.base",
"android.test.mock",
],
- defaults: ["libnetworkstackutilsjni_deps"],
+ defaults: [
+ "framework-connectivity-test-defaults",
+ "libnetworkstackutilsjni_deps"
+ ],
jni_libs: [
// For mockito extended
"libdexmakerjvmtiagent",
@@ -54,7 +57,10 @@
min_sdk_version: "29",
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"],
+ test_mainline_modules: [
+ "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex",
+ "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"
+ ],
defaults: ["NetworkStackTestsDefaults"],
static_libs: ["NetworkStackApiCurrentLib"],
compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit
@@ -80,7 +86,10 @@
min_sdk_version: "29",
target_sdk_version: "30",
test_suites: ["general-tests", "mts"],
- test_mainline_modules: ["CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"],
+ test_mainline_modules: [
+ "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex",
+ "CaptivePortalLoginGoogle.apk+NetworkStackGoogle.apk+com.google.android.resolv.apex+com.google.android.tethering.apex"
+ ],
defaults: ["NetworkStackTestsDefaults"],
static_libs: ["NetworkStackApiStableLib"],
compile_multilib: "both",