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

Commit 4519c0b1 authored by Paul Crowley's avatar Paul Crowley
Browse files

Revert "Make synthetic password enabled by default" 

This reverts commit 4d36be3f.

Change-Id: Ic4615a30f4460541049de7175ad84db1d1fc8a86
parent 4d36be3f

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

+0 −4
Original line number Diff line number Diff line
@@ -1672,10 +1672,6 @@ public class LockPatternUtils { 
        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, 0, UserHandle.USER_SYSTEM) != 0;

    }

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

+2 −5
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ public class LockSettingsService extends ILockSettings.Stub { 


    private static final int PROFILE_KEY_IV_SIZE = 12;

    private static final String SEPARATE_PROFILE_CHALLENGE_KEY = "lockscreen.profilechallenge";

    private static final int SYNTHETIC_PASSWORD_ENABLED_BY_DEFAULT = 1;



    // Order of holding lock: mSeparateChallengeLock -> mSpManager -> this

    private final Object mSeparateChallengeLock = new Object();
@@ -1896,16 +1895,14 @@ public class LockSettingsService extends ILockSettings.Stub { 
    private boolean isSyntheticPasswordBasedCredentialLocked(int userId) throws RemoteException {

        long handle = getSyntheticPasswordHandleLocked(userId);

        // This is a global setting

        long enabled = getLong(SYNTHETIC_PASSWORD_ENABLED_KEY,

                SYNTHETIC_PASSWORD_ENABLED_BY_DEFAULT, UserHandle.USER_SYSTEM);

        long enabled = getLong(SYNTHETIC_PASSWORD_ENABLED_KEY, 0, UserHandle.USER_SYSTEM);

      return enabled != 0 && handle != SyntheticPasswordManager.DEFAULT_HANDLE;

    }



    private boolean shouldMigrateToSyntheticPasswordLocked(int userId) throws RemoteException {

        long handle = getSyntheticPasswordHandleLocked(userId);

        // This is a global setting

        long enabled = getLong(SYNTHETIC_PASSWORD_ENABLED_KEY,

                SYNTHETIC_PASSWORD_ENABLED_BY_DEFAULT, UserHandle.USER_SYSTEM);

        long enabled = getLong(SYNTHETIC_PASSWORD_ENABLED_KEY, 0, UserHandle.USER_SYSTEM);

        return enabled != 0 && handle == SyntheticPasswordManager.DEFAULT_HANDLE;

    }

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

+5 −10
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ class LockSettingsShellCommand extends ShellCommand { 
                    runClear();

                    break;

                case COMMAND_SP:

                    runChangeSp();

                    runEnableSp();

                    break;

                case COMMAND_SET_DISABLED:

                    runSetDisabled();
@@ -107,15 +107,10 @@ class LockSettingsShellCommand extends ShellCommand { 
        mNew = getNextArg();

    }



    private void runChangeSp() {

    private void runEnableSp() {

        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()));