Merge "Prevent hotspot from being affected by the wifi retention feature"

This commit is contained in:
Treehugger Robot
2023-05-08 07:39:12 +00:00
committed by Gerrit Code Review

View File

@@ -2573,6 +2573,14 @@ public class ConnectivityManagerTest {
tetherUtils.registerTetheringEventCallback();
try {
tetherEventCallback.assumeWifiTetheringSupported(mContext);
// To prevent WiFi-to-WiFi interruption while entering APM:
// - If WiFi is retained while entering APM, hotspot will also remain enabled.
// - If WiFi is off before APM or disabled while entering APM, hotspot will be
// disabled.
//
// To ensure hotspot always be disabled after enabling APM, disable wifi before
// enabling the hotspot.
mCtsNetUtils.disableWifi();
tetherUtils.startWifiTethering(tetherEventCallback);
// Update setting to verify the behavior.
@@ -2606,6 +2614,7 @@ public class ConnectivityManagerTest {
ConnectivitySettingsManager.setPrivateDnsMode(mContext, curPrivateDnsMode);
tetherUtils.unregisterTetheringEventCallback(tetherEventCallback);
tetherUtils.stopAllTethering();
mCtsNetUtils.ensureWifiConnected();
}
}