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

Commit 5ccd8291 authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Add synthetic password to authentication flow"

parents dcdaaec8 3bf722a8

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

+13 −1
Original line number Diff line number Diff line
@@ -147,6 +147,10 @@ public class LockPatternUtils { 


    public static final String PROFILE_KEY_NAME_ENCRYPT = "profile_key_name_encrypt_";

    public static final String PROFILE_KEY_NAME_DECRYPT = "profile_key_name_decrypt_";

    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";



    private final Context mContext;

    private final ContentResolver mContentResolver;
@@ -1559,6 +1563,14 @@ public class LockPatternUtils { 
                        break;

                }

            }

        };

        }

    }



    public void enableSyntheticPassword() {

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

    }



    public boolean isSyntheticPasswordEnabled() {

        return getLong(SYNTHETIC_PASSWORD_ENABLED_KEY, 0, UserHandle.USER_SYSTEM) != 0;

    }

}

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

+351 −6

File changed.

Preview size limit exceeded, changes collapsed.

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

+15 −3

File changed.

Preview size limit exceeded, changes collapsed.

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

+53 −3

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −4
Original line number Diff line number Diff line
@@ -2922,10 +2922,10 @@ class StorageManagerService extends IStorageManager.Stub 
        waitForReady();



        if (StorageManager.isFileEncryptedNativeOrEmulated()) {

            // When a user has secure lock screen, require a challenge token to

            // actually unlock. This check is mostly in place for emulation mode.

            if (mLockPatternUtils.isSecure(userId) && ArrayUtils.isEmpty(token)) {

                throw new IllegalStateException("Token required to unlock secure user " + userId);

            // When a user has secure lock screen, require secret to actually unlock.

            // This check is mostly in place for emulation mode.

            if (mLockPatternUtils.isSecure(userId) && ArrayUtils.isEmpty(secret)) {

                throw new IllegalStateException("Secret required to unlock secure user " + userId);

            }



            try {