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

Commit a2b5e1c7 authored by Eric Biggers's avatar Eric Biggers Committed by Android (Google) Code Review
Browse files

Merge "Remove the "locksettings sp" shell command"

parents 99d56a3a 11e4762b

core/java/com/android/internal/widget/LockPatternUtils.java

+0 −15
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ public class LockPatternUtils { 
    public static final String SYNTHETIC_PASSWORD_KEY_PREFIX = "synthetic_password_";



    public static final String SYNTHETIC_PASSWORD_HANDLE_KEY = "sp-handle";

    public static final String SYNTHETIC_PASSWORD_ENABLED_KEY = "enable-sp";

    public static final int SYNTHETIC_PASSWORD_ENABLED_BY_DEFAULT = 1;

    public static final String PASSWORD_HISTORY_DELIMITER = ",";



    @UnsupportedAppUsage
@@ -1709,19 +1707,6 @@ public class LockPatternUtils { 
        }

    }



    public void enableSyntheticPassword() {

        setLong(SYNTHETIC_PASSWORD_ENABLED_KEY, 1L, UserHandle.USER_SYSTEM);

    }



    public void disableSyntheticPassword() {

        setLong(SYNTHETIC_PASSWORD_ENABLED_KEY, 0L, UserHandle.USER_SYSTEM);

    }



    public boolean isSyntheticPasswordEnabled() {

        return getLong(SYNTHETIC_PASSWORD_ENABLED_KEY, SYNTHETIC_PASSWORD_ENABLED_BY_DEFAULT,

                UserHandle.USER_SYSTEM) != 0;

    }



    /**

     * Returns whether the given user has pending escrow tokens

     */

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

+0 −18
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ class LockSettingsShellCommand extends ShellCommand { 
    private static final String COMMAND_SET_PIN = "set-pin";

    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 static final String COMMAND_VERIFY = "verify";

    private static final String COMMAND_GET_DISABLED = "get-disabled";
@@ -125,9 +124,6 @@ class LockSettingsShellCommand extends ShellCommand { 
                case COMMAND_CLEAR:

                    success = runClear();

                    break;

                case COMMAND_SP:

                    runChangeSp();

                    break;

                case COMMAND_SET_DISABLED:

                    runSetDisabled();

                    break;
@@ -224,20 +220,6 @@ class LockSettingsShellCommand extends ShellCommand { 
        mNew = getNextArg();

    }



    private void runChangeSp() {

        if (mNew != null ) {

            if ("1".equals(mNew)) {

                mLockPatternUtils.enableSyntheticPassword();

                getOutPrintWriter().println("Synthetic password enabled");

            } else if ("0".equals(mNew)) {

                mLockPatternUtils.disableSyntheticPassword();

                getOutPrintWriter().println("Synthetic password disabled");

            }

        }

        getOutPrintWriter().println(String.format("SP Enabled = %b",

                mLockPatternUtils.isSyntheticPasswordEnabled()));

    }



    private LockscreenCredential getOldCredential() {

        if (TextUtils.isEmpty(mOld)) {

            return LockscreenCredential.createNone();