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

Merge "Fix CTS test failed on R device" am: afa18f0256 am: 0919cc06c5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I652339d80d81e97399a35e5c2740d878a458a560
This commit is contained in:
Treehugger Robot
2021-02-22 12:49:20 +00:00
committed by Automerger Merge Worker
parent 1eed01b25c 0919cc06c5
commit d517fa33a0
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,6 +109,7 @@ import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import com.android.internal.util.ArrayUtils; import com.android.internal.util.ArrayUtils;
import com.android.modules.utils.build.SdkLevel;
import com.android.testutils.DevSdkIgnoreRule; import com.android.testutils.DevSdkIgnoreRule;
import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo; import com.android.testutils.DevSdkIgnoreRule.IgnoreUpTo;
import com.android.testutils.RecorderCallback.CallbackEntry; import com.android.testutils.RecorderCallback.CallbackEntry;
@@ -521,11 +522,12 @@ public class ConnectivityManagerTest {
mCm.registerDefaultNetworkCallback(defaultTrackingCallback); mCm.registerDefaultNetworkCallback(defaultTrackingCallback);
final TestNetworkCallback systemDefaultTrackingCallback = new TestNetworkCallback(); final TestNetworkCallback systemDefaultTrackingCallback = new TestNetworkCallback();
runWithShellPermissionIdentity(() -> if (SdkLevel.isAtLeastS()) {
mCm.registerSystemDefaultNetworkCallback(systemDefaultTrackingCallback, runWithShellPermissionIdentity(() ->
new Handler(Looper.getMainLooper())), mCm.registerSystemDefaultNetworkCallback(systemDefaultTrackingCallback,
NETWORK_SETTINGS); new Handler(Looper.getMainLooper())),
NETWORK_SETTINGS);
}
Network wifiNetwork = null; Network wifiNetwork = null;
@@ -542,16 +544,20 @@ public class ConnectivityManagerTest {
assertNotNull("Did not receive onAvailable on default network callback", assertNotNull("Did not receive onAvailable on default network callback",
defaultTrackingCallback.waitForAvailable()); defaultTrackingCallback.waitForAvailable());
assertNotNull("Did not receive onAvailable on system default network callback", if (SdkLevel.isAtLeastS()) {
systemDefaultTrackingCallback.waitForAvailable()); assertNotNull("Did not receive onAvailable on system default network callback",
systemDefaultTrackingCallback.waitForAvailable());
}
} catch (InterruptedException e) { } catch (InterruptedException e) {
fail("Broadcast receiver or NetworkCallback wait was interrupted."); fail("Broadcast receiver or NetworkCallback wait was interrupted.");
} finally { } finally {
mCm.unregisterNetworkCallback(callback); mCm.unregisterNetworkCallback(callback);
mCm.unregisterNetworkCallback(defaultTrackingCallback); mCm.unregisterNetworkCallback(defaultTrackingCallback);
runWithShellPermissionIdentity( if (SdkLevel.isAtLeastS()) {
() -> mCm.unregisterNetworkCallback(systemDefaultTrackingCallback), runWithShellPermissionIdentity(
NETWORK_SETTINGS); () -> mCm.unregisterNetworkCallback(systemDefaultTrackingCallback),
NETWORK_SETTINGS);
}
} }
} }