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

Merge "Fix crash when decrementing data usage request" into tm-dev am: 898a5f9acc

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

Change-Id: I18592135ed75480e5b6603aa7cbc7a42e3b77a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-25 00:05:19 +00:00
committed by Automerger Merge Worker
parent 4aab8634c6 898a5f9acc
commit 2e873fe421
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() {