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

Commit 11a19e4c authored by ot903277's avatar ot903277 Committed by Chuanghua Zhao
Browse files

Fix weak global reference overflow 

When the last item of sRunningAttributionSources is removed, the
current check condition will cause the process of removing
sRunningAttributionSources stopped and return directly, bring in weak
global reference table overflow.

Change the order for smooth removal.

Bug: 218794347
Test: run audio stress test pass
Change-Id: I39072f3b72f0be6d6debbcbc948d7a940ad92785
parent 4b7206b8

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

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

            }

        }