Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix potential race condition due to missing lock" am: 8787386e84 am: af33aac24e am: a8c0e350fe

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

Change-Id: If8c420e6daf779940c9e700796e1594eb4bc96ec
This commit is contained in:
Jing Ji
2021-10-21 00:51:05 +00:00
committed by Automerger Merge Worker
parent fff671d660 a8c0e350fe
commit 77af314c76
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -4906,7 +4906,9 @@ public final class ActiveServices {
sr.setProcess(null, null, 0, null); sr.setProcess(null, null, 0, null);
sr.isolatedProc = null; sr.isolatedProc = null;
sr.executeNesting = 0; sr.executeNesting = 0;
sr.forceClearTracker(); synchronized (mAm.mProcessStats.mLock) {
sr.forceClearTracker();
}
if (mDestroyingServices.remove(sr)) { if (mDestroyingServices.remove(sr)) {
if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "killServices remove destroying " + sr); if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "killServices remove destroying " + sr);
} }
@@ -5056,7 +5058,9 @@ public final class ActiveServices {
i--; i--;
ServiceRecord sr = mDestroyingServices.get(i); ServiceRecord sr = mDestroyingServices.get(i);
if (sr.app == app) { if (sr.app == app) {
sr.forceClearTracker(); synchronized (mAm.mProcessStats.mLock) {
sr.forceClearTracker();
}
mDestroyingServices.remove(i); mDestroyingServices.remove(i);
if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "killServices remove destroying " + sr); if (DEBUG_SERVICE) Slog.v(TAG_SERVICE, "killServices remove destroying " + sr);
} }