commit d1a6cd9185338f1237db35d5a02b3b82facfe47e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 13 22:25:36 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 13 22:25:36 2022 +0000
tree 52d01ec20a5aa7b2eb5f92dcadfc49316f88853f
parent 1622d409d9cf672ea8b81b8037142dafc66f8ce5
parent 11a19e4c715cb6a7fbbfd001a59a743c6e18384c

Merge "Fix weak global reference overflow"

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 290f4ae..336c27d 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -5689,16 +5689,21 @@
                     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;
             }
         }