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

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

am 1872ce3e: am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug:... 

am 1872ce3e: am 155e3133: am d511bc17: Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."

* commit '1872ce3e':
  [ActivityManager] Fix a bug: unable to start activity after starting activities during screen off.
parents 7ef7ef0e 1872ce3e

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

+3 −0
Original line number Diff line number Diff line
@@ -2708,6 +2708,9 @@ final class ActivityStack { 
        if (mResumedActivity == r) {

            mResumedActivity = null;

        }

        if (mPausingActivity == r) {

            mPausingActivity = null;

        }

        if (mService.mFocusedActivity == r) {

            mService.mFocusedActivity = null;

        }