Merge "Fix NullPointerException when running testRequestBackgroundNetwork"
This commit is contained in:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user