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

Commit f4d4aa1a authored by Kevin Hester-Chow's avatar Kevin Hester-Chow Committed by Android Git Automerger
Browse files

am e0cbb81b: Merge "Do not assume that there is always a running activity... 

am e0cbb81b: Merge "Do not assume that there is always a running activity (Necessary for headless devices)" into ics-aah

* commit 'e0cbb81b':
  Do not assume that there is always a running activity (Necessary for headless devices)
parents a2f924d4 e0cbb81b

services/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -7150,7 +7150,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            mMainStack.resumeTopActivityLocked(null);

        } else {

            ActivityRecord r = mMainStack.topRunningActivityLocked(null);

            if (r.app == app) {

            if (r != null && r.app == app) {

                // If the top running activity is from this crashing

                // process, then terminate it to avoid getting in a loop.

                Slog.w(TAG, "  Force finishing activity "