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

Commit 987fa2b8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Let Home activity restart during first few crashes" into rvc-dev am: d0db17a1 

Change-Id: I04fc28c60f6ee2f759b4b596ceaa62309830b953
parents 0e66b860 d0db17a1

services/core/java/com/android/server/wm/ActivityStack.java

+7 −0
Original line number Diff line number Diff line
@@ -2572,6 +2572,13 @@ class ActivityStack extends Task { 
        if (r == null || r.app != app) {

            return null;

        }

        if (r.isActivityTypeHome() && mAtmService.mHomeProcess == app) {

            // Home activities should not be force-finished as we have nothing else to go

            // back to. AppErrors will get to it after two crashes in MIN_CRASH_INTERVAL.

            Slog.w(TAG, "  Not force finishing home activity "

                    + r.intent.getComponent().flattenToShortString());

            return null;

        }

        Slog.w(TAG, "  Force finishing activity "

                + r.intent.getComponent().flattenToShortString());

        Task finishedTask = r.getTask();