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

Commit 32383b71 authored by Kunal Malhotra's avatar Kunal Malhotra Committed by Android (Google) Code Review
Browse files

Merge "Adding in fix for ensuring that mCrashing is cleared on restart for... 

Merge "Adding in fix for ensuring that mCrashing is cleared on restart for persistent processes" into main
parents 91886a16 f15a6a49

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

+2 −0
Original line number Diff line number Diff line
@@ -3087,6 +3087,8 @@ public final class ProcessList { 
            if (old == proc && proc.isPersistent()) {

                // We are re-adding a persistent process.  Whatevs!  Just leave it there.

                Slog.w(TAG, "Re-adding persistent process " + proc);

                // Ensure that the mCrashing flag is cleared, since this is a restart

                proc.resetCrashingOnRestart();

            } else if (old != null) {

                if (old.isKilled()) {

                    // The old process has been killed, we probably haven't had

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

+4 −0
Original line number Diff line number Diff line
@@ -618,6 +618,10 @@ class ProcessRecord implements WindowProcessListener { 
        mPkgList.put(_info.packageName, new ProcessStats.ProcessStateHolder(_info.longVersionCode));

    }



    void resetCrashingOnRestart() {

        mErrorState.setCrashing(false);

    }



    @GuardedBy(anyOf = {"mService", "mProcLock"})

    UidRecord getUidRecord() {

        return mUidRecord;