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

Commit 6e4765f7 authored by Jing Ji's avatar Jing Ji Committed by Automerger Merge Worker
Browse files

Merge "Relax the lock in getMemoryStateForProcesses" into sc-dev am: 286f70df 

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

Change-Id: I22799be1d094cf95f27965c3ea084d46f4356069
parents a6b0b839 286f70df

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

+5 −7
Original line number Diff line number Diff line
@@ -15548,7 +15548,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
        @Override

        public List<ProcessMemoryState> getMemoryStateForProcesses() {

            List<ProcessMemoryState> processMemoryStates = new ArrayList<>();

            synchronized (mProcLock) {

            synchronized (mPidsSelfLocked) {

                for (int i = 0, size = mPidsSelfLocked.size(); i < size; i++) {

                    final ProcessRecord r = mPidsSelfLocked.valueAt(i);
@@ -15556,7 +15555,6 @@ public class ActivityManagerService extends IActivityManager.Stub 
                            r.uid, r.getPid(), r.processName, r.mState.getCurAdj()));

                }

            }

            }

            return processMemoryStates;

        }