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

Commit d511bc17 authored by Craig Mautner's avatar Craig Mautner Committed by Gerrit Code Review
Browse files

Merge "[ActivityManager] Fix a bug: unable to start activity after starting... 

Merge "[ActivityManager] Fix a bug: unable to start activity after starting activities during screen off."
parents e328056d 82a91631

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

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

        if (mResumedActivity == r) {

            mResumedActivity = null;

            mResumedActivity = null;

        }

        }

        if (mPausingActivity == r) {

            mPausingActivity = null;

        }

        if (mService.mFocusedActivity == r) {

        if (mService.mFocusedActivity == r) {

            mService.mFocusedActivity = null;

            mService.mFocusedActivity = null;

        }

        }