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

Commit 380415b6 authored by Olawale Ogunwale's avatar Olawale Ogunwale Committed by Android Git Automerger
Browse files

am 1bdbce29: Merge "[ActivityManager] Finish the failed-to-pause activity" 

* commit '1bdbce29':
  [ActivityManager] Finish the failed-to-pause activity
parents e4d787b2 1bdbce29

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

+5 −0
Original line number Diff line number Diff line
@@ -899,6 +899,11 @@ final class ActivityStack { 
                        r.userId, System.identityHashCode(r), r.shortComponentName,

                        mPausingActivity != null

                            ? mPausingActivity.shortComponentName : "(none)");

                if (r.finishing && r.state == ActivityState.PAUSING) {

                    if (DEBUG_PAUSE) Slog.v(TAG,

                            "Executing finish of failed to pause activity: " + r);

                    finishCurrentActivityLocked(r, FINISH_AFTER_VISIBLE, false);

                }

            }

        }

    }