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

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

Merge "Fix potential race condition due to missing lock" am: 8787386e 

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

Change-Id: I8ec769f756e043e5fb35e18ac7e85bd195bf56ac
parents 722b3172 8787386e

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

+6 −2
Original line number Diff line number Diff line
@@ -4906,7 +4906,9 @@ public final class ActiveServices { 
            sr.setProcess(null, null, 0, null);

            sr.isolatedProc = null;

            sr.executeNesting = 0;

            synchronized (mAm.mProcessStats.mLock) {

                sr.forceClearTracker();

            }

            if (mDestroyingServices.remove(sr)) {

                if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "killServices remove destroying " + sr);

            }
@@ -5056,7 +5058,9 @@ public final class ActiveServices { 
            i--;

            ServiceRecord sr = mDestroyingServices.get(i);

            if (sr.app == app) {

                synchronized (mAm.mProcessStats.mLock) {

                    sr.forceClearTracker();

                }

                mDestroyingServices.remove(i);

                if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "killServices remove destroying " + sr);

            }