From bfaefe42d1113c98236ab7be41247c786bfb3ad4 Mon Sep 17 00:00:00 2001 From: lucaslin Date: Mon, 15 Mar 2021 18:49:10 +0800 Subject: [PATCH] Fix NullPointerException when running testRequestBackgroundNetwork aosp/1622675 made handler to be nonnull but testRequestBackgroundNetwork still pass null as handler when calling requestBackgroundNetwork, so there is a NullPointerException when running testRequestBackgroundNetwork. Bug: 175662146 Test: atest CtsNetTestCases:ConnectivityManagerTest#testRequestBackgroundNetwork Change-Id: I871992549dfc8cc356221164f1dd49c64f0dae67 --- .../cts/net/src/android/net/cts/ConnectivityManagerTest.java | 5 +++-- 1 file changed, 3 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 e3208e7f42..43e9970906 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -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.