joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix crash when decrementing data usage request" into tm-dev

Browse source
This commit is contained in:
TreeHugger Robot 2022-05-24 23:52:30 +00:00 • committed by Android (Google) Code Review
commit 898a5f9acc
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service-t/src/com/android/server/net/NetworkStatsObservers.java
View file

@ -198,7 +198,7 @@ class NetworkStatsObservers {
if (LOG) Log.d(TAG, "Unregistering " + requestInfo);
mDataUsageRequests.remove(request.requestId);
mDataUsageRequestsPerUid.decrementCountOrThrow(callingUid);
mDataUsageRequestsPerUid.decrementCountOrThrow(requestInfo.mCallingUid);
requestInfo.unlinkDeathRecipient();
requestInfo.callCallback(NetworkStatsManager.CALLBACK_RELEASED);
}

6
tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java
View file

@ -274,8 +274,12 @@ public class NetworkStatsObserversTest {
mStatsObservers.unregister(request, UID_BLUE);
waitForObserverToIdle();
Mockito.verifyZeroInteractions(mUsageCallbackBinder);
// Verify that system uid can unregister for other uids.
mStatsObservers.unregister(request, Process.SYSTEM_UID);
waitForObserverToIdle();
mUsageCallback.expectOnCallbackReleased(request);
}
private NetworkIdentitySet makeTestIdentSet() {