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

Commit dac644cd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Deprecate inKeyguardRestrictedInputMode"

parents 787a43b2 5f13cf05

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4995,7 +4995,7 @@ package android.app { 
  public class KeyguardManager {

    method public android.content.Intent createConfirmDeviceCredentialIntent(java.lang.CharSequence, java.lang.CharSequence);

    method public deprecated void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);

    method public boolean inKeyguardRestrictedInputMode();

    method public deprecated boolean inKeyguardRestrictedInputMode();

    method public boolean isDeviceLocked();

    method public boolean isDeviceSecure();

    method public boolean isKeyguardLocked();

core/java/android/app/KeyguardManager.java

+3 −5
Original line number Diff line number Diff line
@@ -382,6 +382,8 @@ public class KeyguardManager { 
    }



    /**

     * @deprecated Use {@link #isKeyguardLocked()} instead.

     *

     * If keyguard screen is showing or in restricted key input mode (i.e. in

     * keyguard password emergency screen). When in such mode, certain keys,

     * such as the Home key and the right soft keys, don't work.
@@ -389,11 +391,7 @@ public class KeyguardManager { 
     * @return true if in keyguard restricted input mode.

     */

    public boolean inKeyguardRestrictedInputMode() {

        try {

            return mWM.inKeyguardRestrictedInputMode();

        } catch (RemoteException ex) {

            return false;

        }

        return isKeyguardLocked();

    }



    /**

core/java/android/view/IWindowManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ interface IWindowManager 
    void exitKeyguardSecurely(IOnKeyguardExitResult callback);

    boolean isKeyguardLocked();

    boolean isKeyguardSecure();

    boolean inKeyguardRestrictedInputMode();

    void dismissKeyguard(IKeyguardDismissCallback callback);



    // Requires INTERACT_ACROSS_USERS_FULL permission

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

+1 −8
Original line number Diff line number Diff line
@@ -3381,7 +3381,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    boolean keyguardOn() {

        return isKeyguardShowingAndNotOccluded() || inKeyguardRestrictedKeyInputMode();

        return isKeyguardShowingAndNotOccluded();

    }



    private static final int[] WINDOW_TYPES_WHERE_HOME_DOESNT_WORK = {
@@ -6872,13 +6872,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        return mKeyguardOccluded;

    }



    /** {@inheritDoc} */

    @Override

    public boolean inKeyguardRestrictedKeyInputMode() {

        if (mKeyguardDelegate == null) return false;

        return mKeyguardDelegate.isInputRestricted();

    }



    @Override

    public void dismissKeyguardLw(IKeyguardDismissCallback callback) {

        if (mKeyguardDelegate != null && mKeyguardDelegate.isShowing()) {

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

+0 −11
Original line number Diff line number Diff line
@@ -1356,17 +1356,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { 
     */

    public boolean isKeyguardTrustedLw();



    /**

     * inKeyguardRestrictedKeyInputMode

     *

     * if keyguard screen is showing or in restricted key input mode (i.e. in

     * keyguard password emergency screen). When in such mode, certain keys,

     * such as the Home key and the right soft keys, don't work.

     *

     * @return true if in keyguard restricted input mode.

     */

    public boolean inKeyguardRestrictedKeyInputMode();



    /**

     * Ask the policy to dismiss the keyguard, if it is currently shown.

     *