Merge "[VCN20.2] Change requestBackgroundNetwork argument order" am: afd18ddd57

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

Change-Id: Ie99d30e70de1cf1593448629532a90b4edc2d17b
This commit is contained in:
Junyu Lai
2021-04-16 16:25:55 +00:00
committed by Automerger Merge Worker

View File

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