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

Commit 04049159 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 053ce1e7: am 40185726: am a9c5257a: am a0bb44ef: Merge "Finish crashed... 

am 053ce1e7: am 40185726: am a9c5257a: am a0bb44ef: Merge "Finish crashed activities immediately" into klp-modular-dev

* commit '053ce1e7a85e3ca7820a3b9e1b2c203d1a1a345b':
  Finish crashed activities immediately
parents cef99164 ff3efc2d

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -3801,7 +3801,9 @@ final class ActivityStack { 
                if (r.app == app) {

                if (r.app == app) {

                    Slog.w(TAG, "  Force finishing activity "

                    Slog.w(TAG, "  Force finishing activity "

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

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

                    finishActivityLocked(r, Activity.RESULT_CANCELED, null, "crashed", false);

                    // Force the destroy to skip right to removal.

                    r.app = null;

                    finishCurrentActivityLocked(r, FINISH_IMMEDIATELY, false);

                }

                }

            }

            }

        }

        }