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

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

Merge "[AMS] Fix race condition in ProcessList." am: a5ef7d77 am: 7e4801ab 

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



Change-Id: Id2ed8e62aa4c773d624fee78846a776b7fd0ea3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0fb49b04 7e4801ab

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

+8 −6
Original line number Diff line number Diff line
@@ -577,6 +577,7 @@ class AppErrors { 
            mPackageWatchdog.onPackageFailure(r.getPackageListWithVersionCode(),

                    PackageWatchdog.FAILURE_REASON_APP_CRASH);



            synchronized (mService) {

                mService.mProcessList.noteAppKill(r, (crashInfo != null

                          && "Native crash".equals(crashInfo.exceptionClassName))

                          ? ApplicationExitInfo.REASON_CRASH_NATIVE
@@ -584,6 +585,7 @@ class AppErrors { 
                          ApplicationExitInfo.SUBREASON_UNKNOWN,

                        "crash");

            }

        }



        final int relaunchReason = r != null

                ? r.getWindowProcessController().computeRelaunchReason() : RELAUNCH_REASON_NONE;