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

Commit 231bd6c5 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Dismiss keyguard when resuming visible activities" into klp-dev

parents 8fb6d97a 0756632a
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -937,6 +937,10 @@ final class ActivityStack {
        next.idle = false;
        next.results = 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.
        mStackSupervisor.scheduleIdleTimeoutLocked(next);