Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fcd05c7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix weak global reference overflow" am: d1a6cd91 am: 199deef1 am:... 

Merge "Fix weak global reference overflow" am: d1a6cd91 am: 199deef1 am: acb7f6d8 am: af3fc0c1 am: 141db075

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



Change-Id: Ib29d977b6a35218315e183e74f6927aa888bbd6d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e35b0a50 141db075

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

+10 −5
Original line number Diff line number Diff line
@@ -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;

            }

        }