LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix NullPointerException when running testRequestBackgroundNetwork" am: 25e4e50f25 am: 79cd256ec2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4aba2412ddc9d1542bb85a6e4df4afa88cddbbde
This commit is contained in:
Lorenzo Colitti
2021-03-15 14:24:34 +00:00
committed by Automerger Merge Worker
parent 235097b32b 79cd256ec2
commit 6643be3850
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

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