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

Commit ffe43ead authored by wilsonshih's avatar wilsonshih
Browse files

Fix IME cannot show in lock task mode. 

Replace check condition isKeyguardShowing instead of isKeyguardLocked in
shouldBeHiddenByKeyguard.
The check method isKeyguardLocked implies it will check if the device is
in restricted key input mode, which should be true for next time keyguard
shows. However, when keyguard is not showing, the IME should be visible.

Fix: 123399725
Test: atest KeyguardDisableHandlerTest KeyguardTests KeyguardLockedTests

Change-Id: I804920a44da33fef923ada8c05e08283e04b5aa0
parent 1cdbfae1

services/core/java/com/android/server/policy/PhoneWindowManager.java

+4 −3
Original line number Diff line number Diff line
@@ -2316,14 +2316,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        boolean allowWhenLocked = (win.isInputMethodWindow() || imeTarget == this)

                && showImeOverKeyguard;



        if (isKeyguardLocked() && isKeyguardOccluded()) {

        final boolean isKeyguardShowing = mKeyguardDelegate.isShowing();



        if (isKeyguardShowing && isKeyguardOccluded()) {

            // Show SHOW_WHEN_LOCKED windows if Keyguard is occluded.

            allowWhenLocked |= win.canShowWhenLocked()

                    // Show error dialogs over apps that are shown on lockscreen

                    || (attrs.privateFlags & PRIVATE_FLAG_SYSTEM_ERROR) != 0;

        }



        boolean keyguardLocked = isKeyguardLocked();

        boolean hideDockDivider = attrs.type == TYPE_DOCK_DIVIDER

                && !mWindowManagerInternal.isStackVisible(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);

        // If AOD is showing, the IME should be hidden. However, sometimes the AOD is considered
@@ -2333,7 +2334,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        // now shown.

        final boolean hideIme = win.isInputMethodWindow()

                && (mAodShowing || !mDefaultDisplayPolicy.isWindowManagerDrawComplete());

        return (keyguardLocked && !allowWhenLocked && win.getDisplayId() == DEFAULT_DISPLAY)

        return (isKeyguardShowing && !allowWhenLocked && win.getDisplayId() == DEFAULT_DISPLAY)

                || hideDockDivider || hideIme;

    }