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

Commit 3a69f68f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "CTS doesn't like swiping." into oc-dev am: 24ced03e 

am: 5f6bf06d

Change-Id: I783f699183a6fada92f3777d86ecbf736d94ba7e
parents 9b4a020d 5f6bf06d

services/core/java/com/android/server/LockSettingsShellCommand.java

+10 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ class LockSettingsShellCommand extends ShellCommand { 
    private static final String COMMAND_SET_PASSWORD = "set-password";

    private static final String COMMAND_CLEAR = "clear";

    private static final String COMMAND_SP = "sp";

    private static final String COMMAND_SET_DISABLED = "set-disabled";



    private int mCurrentUserId;

    private final LockPatternUtils mLockPatternUtils;
@@ -72,6 +73,9 @@ class LockSettingsShellCommand extends ShellCommand { 
                case COMMAND_SP:

                    runEnableSp();

                    break;

                case COMMAND_SET_DISABLED:

                    runSetDisabled();

                    break;

                default:

                    getErrPrintWriter().println("Unknown command: " + cmd);

                    break;
@@ -132,6 +136,12 @@ class LockSettingsShellCommand extends ShellCommand { 
        getOutPrintWriter().println("Lock credential cleared");

    }



    private void runSetDisabled() throws RemoteException {

        final boolean disabled = Boolean.parseBoolean(mNew);

        mLockPatternUtils.setLockScreenDisabled(disabled, mCurrentUserId);

        getOutPrintWriter().println("Lock screen disabled set to " + disabled);

    }



    private boolean checkCredential() throws RemoteException, RequestThrottledException {

        final boolean havePassword = mLockPatternUtils.isLockPasswordEnabled(mCurrentUserId);

        final boolean havePattern = mLockPatternUtils.isLockPatternEnabled(mCurrentUserId);