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

Commit 44fe675e authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Acquire proc lock prior to the call into AM service connection holder"... 

Merge "Acquire proc lock prior to the call into AM service connection holder" into sc-dev am: db4ff9ef

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

Change-Id: I88438aeea7dfc89b4cad6afa24c8abcd8b1bb798
parents 2f52aa88 db4ff9ef

services/core/java/com/android/server/am/ActivityManagerService.java

+5 −3
Original line number Diff line number Diff line
@@ -15656,11 +15656,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
            final ActivityServiceConnectionsHolder holder =

                    (ActivityServiceConnectionsHolder) connectionHolder;

            synchronized (ActivityManagerService.this) {

                synchronized (mProcLock) {

                    holder.forEachConnection(cr -> mServices.removeConnectionLocked(

                            (ConnectionRecord) cr, null /* skipApp */, holder /* skipAct */,

                            false /* enqueueOomAdj */));

                }

            }

        }















        public void cleanUpServices(int userId, ComponentName component, Intent baseIntent) {















            synchronized(ActivityManagerService.this) {