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

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

am 231bd6c5: Merge "Dismiss keyguard when resuming visible activities" into klp-dev 

* commit '231bd6c5':
  Dismiss keyguard when resuming visible activities
parents 66d1cd9d 231bd6c5

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -937,6 +937,10 @@ final class ActivityStack { 
        next.idle = false;

        next.idle = false;

        next.results = null;

        next.results = null;

        next.newIntents = null;

        next.newIntents = null;

        if (next.nowVisible) {

            // We won't get a call to reportActivityVisibleLocked() so dismiss lockscreen now.

            mStackSupervisor.dismissKeyguard();

        }





        // schedule an idle timeout in case the app doesn't do it for us.

        // schedule an idle timeout in case the app doesn't do it for us.

        mStackSupervisor.scheduleIdleTimeoutLocked(next);

        mStackSupervisor.scheduleIdleTimeoutLocked(next);