Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix weak global reference overflow" am: d1a6cd9185 am: 199deef1be

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2150993

Change-Id: I4db6a50a9ac92b097442d995c6df26017d808996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-07-13 23:03:37 +00:00
committed by Automerger Merge Worker
parent 81bcc784eb 199deef1be
commit acb7f6d887
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -1111,16 +1111,21 @@ public class PermissionManagerService extends IPermissionManager.Stub {
appOpsManager.finishProxyOp(AppOpsManager.opToPublicName(op), appOpsManager.finishProxyOp(AppOpsManager.opToPublicName(op),
resolvedAttributionSource, skipCurrentFinish); resolvedAttributionSource, skipCurrentFinish);
} }
if (next == null || next.getNext() == null) {
return;
}
RegisteredAttribution registered = RegisteredAttribution registered =
sRunningAttributionSources.remove(current.getToken()); sRunningAttributionSources.remove(current.getToken());
if (registered != null) { if (registered != null) {
registered.unregister(); registered.unregister();
} }
if (next == null || next.getNext() == null) {
if (next != null) {
registered = sRunningAttributionSources.remove(next.getToken());
if (registered != null) {
registered.unregister();
}
}
return;
}
current = next; current = next;
} }
} }