Merge tag 'android-14.0.0_r17' into staging/lineage-21.0_merge-android-14.0.0_r17
Android 14.0.0 Release 17 (UQ1A.231205.015)
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZXDPNAAKCRDorT+BmrEO
# eFM+AJ9m+Z/E/kowJ3tfdRRqadgPM+RjBACeMQkAHimCveNIXVGr3+QbJo/xivk=
# =2L8P
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Dec 6 21:44:52 2023 EET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2188 signatures in the past
# 2 years. Encrypted 4 messages in the past 23 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78
# By Bill Yi (23) and others
# Via Automerger Merge Worker (915) and others
* tag 'android-14.0.0_r17': (32 commits)
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Remove unnecessary override of Parcelable.getStability()
Update tests for VPN data stall recovery
Skip writing the metrics before T.
Evaluation delay = 8 secs for explicitly selected networks
Allow firing the LOST_INTERNET intent immediately in config
[DO NOT MERGE] Disable tests that depend on the prebuilt version in U
Never create native network immediately.
Revert "Always disconnect agents immediately."
...
Change-Id: I120c41f8c98c681f7c19ec7d7758ea649e2affb4
diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index f0ad3f1..4451a88 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -2591,6 +2591,7 @@
// prevent the race condition between airplane mode enabled and the followed
// up wifi tethering enabled.
tetherEventCallback.expectNoTetheringActive();
+ tetherUtils.expectSoftApDisabled();
// start wifi tethering
tetherUtils.startWifiTethering(tetherEventCallback);