From 989cf46ba06b7c2d35a821d985f20a191dcaa931 Mon Sep 17 00:00:00 2001 From: junyulai Date: Thu, 15 Apr 2021 20:59:08 +0800 Subject: [PATCH] [VCN20.2] Change requestBackgroundNetwork argument order Test: atest FrameworksNetTests FrameworksVcnTests Fix: 185215095 Merged-In: I09ff7461b655cbfc6ed5a7db07e02a388cd3d079 Change-Id: I09ff7461b655cbfc6ed5a7db07e02a388cd3d079 (cherry-picked from ag/14185520) --- .../cts/net/src/android/net/cts/ConnectivityManagerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 18f05888b4..8e7e3f34c6 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -1730,14 +1730,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.