LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Force-reconnect wifi (and cell) after disabling airplane mode"

Browse Source
This commit is contained in:
Treehugger Robot
2021-07-30 08:02:13 +00:00
committed by Gerrit Code Review
parent d8944c9e7b 9ac0093c64
commit 8a9562f2c4
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -1825,8 +1825,15 @@ public class ConnectivityManagerTest {
// Verify that networks are available as expected if wifi or cell is supported. Continue the // Verify that networks are available as expected if wifi or cell is supported. Continue the
// test if none of them are supported since test should still able to verify the permission // test if none of them are supported since test should still able to verify the permission
// mechanism. // mechanism.
if (supportWifi) requestAndWaitForAvailable(makeWifiNetworkRequest(), wifiCb); if (supportWifi) {
if (supportTelephony) requestAndWaitForAvailable(makeCellNetworkRequest(), telephonyCb); mCtsNetUtils.ensureWifiConnected();
registerCallbackAndWaitForAvailable(makeWifiNetworkRequest(), wifiCb);
}
if (supportTelephony) {
// connectToCell needs to be followed by disconnectFromCell, which is called in tearDown
mCtsNetUtils.connectToCell();
registerCallbackAndWaitForAvailable(makeCellNetworkRequest(), telephonyCb);
}
try { try {
// Verify we cannot set Airplane Mode without correct permission: // Verify we cannot set Airplane Mode without correct permission:
@@ -1863,6 +1870,8 @@ public class ConnectivityManagerTest {
+ "called whilst holding the NETWORK_AIRPLANE_MODE permission."); + "called whilst holding the NETWORK_AIRPLANE_MODE permission.");
} }
// Verify that turning airplane mode off takes effect as expected. // Verify that turning airplane mode off takes effect as expected.
// connectToCell only registers a request, it cannot / does not need to be called twice
mCtsNetUtils.ensureWifiConnected();
if (supportWifi) waitForAvailable(wifiCb); if (supportWifi) waitForAvailable(wifiCb);
if (supportTelephony) waitForAvailable(telephonyCb); if (supportTelephony) waitForAvailable(telephonyCb);
} finally { } finally {
@@ -1875,7 +1884,7 @@ public class ConnectivityManagerTest {
} }
} }
private void requestAndWaitForAvailable(@NonNull final NetworkRequest request, private void registerCallbackAndWaitForAvailable(@NonNull final NetworkRequest request,
@NonNull final TestableNetworkCallback cb) { @NonNull final TestableNetworkCallback cb) {
mCm.registerNetworkCallback(request, cb); mCm.registerNetworkCallback(request, cb);
waitForAvailable(cb); waitForAvailable(cb);