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

Merge "[CM] Fix NPE due to unvalidated callback value"

Browse Source
This commit is contained in:
Etan Cohen
2019-05-23 16:01:51 +00:00
committed by Gerrit Code Review
parent 26c1cdb19d 1f1bcb0b68
commit 62790fbdfe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -3864,6 +3864,7 @@ public class ConnectivityServiceTest {
} }
} }
testFactory.expectRemoveRequests(1);
if (preUnregister) { if (preUnregister) {
mCm.unregisterNetworkCallback(networkCallback); mCm.unregisterNetworkCallback(networkCallback);
@@ -3873,7 +3874,6 @@ public class ConnectivityServiceTest {
testFactory.triggerUnfulfillable(requests.get(newRequestId)); testFactory.triggerUnfulfillable(requests.get(newRequestId));
} else { } else {
// Simulate the factory releasing the request as unfulfillable and expect onUnavailable! // Simulate the factory releasing the request as unfulfillable and expect onUnavailable!
testFactory.expectRemoveRequests(1);
testFactory.triggerUnfulfillable(requests.get(newRequestId)); testFactory.triggerUnfulfillable(requests.get(newRequestId));
networkCallback.expectCallback(CallbackState.UNAVAILABLE, null); networkCallback.expectCallback(CallbackState.UNAVAILABLE, null);