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

Commit 32fe65cd authored by Pavel Grafov's avatar Pavel Grafov Committed by android-build-merger
Browse files

Merge "Don't attemp to verify synthetic password from adb." into oc-mr1-dev 

am: b64fef76

Change-Id: Ib5b6a0c7b35d9dfb43d97c31eceb7e7b7564b294
parents 1afb2417 b64fef76

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

+5 −0
Original line number Diff line number Diff line
@@ -160,6 +160,11 @@ class LockSettingsShellCommand extends ShellCommand { 
        final boolean havePassword = mLockPatternUtils.isLockPasswordEnabled(mCurrentUserId);

        final boolean havePattern = mLockPatternUtils.isLockPatternEnabled(mCurrentUserId);

        if (havePassword || havePattern) {

            if (mLockPatternUtils.isManagedProfileWithUnifiedChallenge(mCurrentUserId)) {

                getOutPrintWriter().println("Profile uses unified challenge");

                return false;

            }



            try {

                final boolean result;

                if (havePassword) {