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

Commit 2d33b1f6 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 925aedb0: am 3d9509d3: am ddf411d6: Merge "Fix that Keyguard didn\'t always... 

am 925aedb0: am 3d9509d3: am ddf411d6: Merge "Fix that Keyguard didn\'t always get onActivityDrawn call" into lmp-dev

* commit '925aedb08fcf81994e95424144744feadd5097a7':
  Fix that Keyguard didn't always get onActivityDrawn call
parents c2236c67 339878e1

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

+3 −0
Original line number Diff line number Diff line
@@ -1492,6 +1492,9 @@ final class ActivityStack { 
            ActivityOptions.abort(options);

            if (DEBUG_STATES) Slog.d(TAG, "resumeTopActivityLocked: Top activity resumed " + next);

            if (DEBUG_STACK) mStackSupervisor.validateTopActivitiesLocked();



            // Make sure to notify Keyguard as well if it is waiting for an activity to be drawn.

            mStackSupervisor.notifyActivityDrawnForKeyguard();

            return false;

        }