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

Commit b7380d16 authored by Arthur Hung's avatar Arthur Hung Committed by android-build-merger
Browse files

Merge "Fix PIP window is showing on the lockscreen (1/2)" into qt-dev am: 031ec27e 

am: 1e05f069

Change-Id: I935898913dbb031b50230a1e83ca0ac17064d29a
parents cacc9f90 1e05f069

services/core/java/com/android/server/wm/KeyguardController.java

+2 −1
Original line number Diff line number Diff line
@@ -264,7 +264,8 @@ class KeyguardController { 
        // Keyguard.

        return dismissKeyguard && canDismissKeyguard() && !mAodShowing

                && (mDismissalRequested

                || getDisplay(r.getDisplayId()).mDismissingKeyguardActivity != r);

                || (r.canShowWhenLocked()

                        && getDisplay(r.getDisplayId()).mDismissingKeyguardActivity != r));

    }



    /**