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 am: acb7f6d887 am: af3fc0c14a am: 141db07589

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

Change-Id: Ib29d977b6a35218315e183e74f6927aa888bbd6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-07-14 00:05:06 +00:00
committed by Automerger Merge Worker
parent e35b0a5001 141db07589
commit 3fcd05c7db
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

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