Merge "Fix NullPointerException when running testRequestBackgroundNetwork"

This commit is contained in:
Lorenzo Colitti
2021-03-15 13:09:14 +00:00
committed by Gerrit Code Review

View File

@@ -1603,15 +1603,16 @@ public class ConnectivityManagerTest {
// Verify background network cannot be requested without NETWORK_SETTINGS permission.
final TestableNetworkCallback callback = new TestableNetworkCallback();
final Handler handler = new Handler(Looper.getMainLooper());
assertThrows(SecurityException.class,
() -> mCmShim.requestBackgroundNetwork(testRequest, null, callback));
() -> mCmShim.requestBackgroundNetwork(testRequest, handler, callback));
Network testNetwork = null;
try {
// Request background test network via Shell identity which has NETWORK_SETTINGS
// permission granted.
runWithShellPermissionIdentity(
() -> mCmShim.requestBackgroundNetwork(testRequest, null, callback),
() -> mCmShim.requestBackgroundNetwork(testRequest, handler, callback),
new String[] { android.Manifest.permission.NETWORK_SETTINGS });
// Register the test network agent which has no foreground request associated to it.