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

Merge "[AMS] Fix race condition in ProcessList." am: a5ef7d7741 am: 7e4801abfb

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

Change-Id: Id2ed8e62aa4c773d624fee78846a776b7fd0ea3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jing Ji
2022-04-19 02:16:41 +00:00
committed by Automerger Merge Worker
parent 0fb49b04db 7e4801abfb
commit e2fe15e9b8
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/AppErrors.java
View File

@@ -577,6 +577,7 @@ class AppErrors {
mPackageWatchdog.onPackageFailure(r.getPackageListWithVersionCode(), mPackageWatchdog.onPackageFailure(r.getPackageListWithVersionCode(),
PackageWatchdog.FAILURE_REASON_APP_CRASH); PackageWatchdog.FAILURE_REASON_APP_CRASH);
synchronized (mService) {
mService.mProcessList.noteAppKill(r, (crashInfo != null mService.mProcessList.noteAppKill(r, (crashInfo != null
&& "Native crash".equals(crashInfo.exceptionClassName)) && "Native crash".equals(crashInfo.exceptionClassName))
? ApplicationExitInfo.REASON_CRASH_NATIVE ? ApplicationExitInfo.REASON_CRASH_NATIVE
@@ -584,6 +585,7 @@ class AppErrors {
ApplicationExitInfo.SUBREASON_UNKNOWN, ApplicationExitInfo.SUBREASON_UNKNOWN,
"crash"); "crash");
} }
}
final int relaunchReason = r != null final int relaunchReason = r != null
? r.getWindowProcessController().computeRelaunchReason() : RELAUNCH_REASON_NONE; ? r.getWindowProcessController().computeRelaunchReason() : RELAUNCH_REASON_NONE;