PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fail the screen lock flow if the old password has already changed.

Browse Source 
Test: atest RunSettingsRoboTests
Bug: 120039091
Change-Id: Ib0860ccbc1ba84a2ac8dafcf3cf33f6ddf160e4c
This commit is contained in:
Irina Dumitrescu
2019-02-28 15:35:36 +00:00
parent 4db6ebbf4d
commit 4b96dc3ec7
4 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/settings/password/ChooseLockPattern.java
View File

@@ -24,6 +24,7 @@ import android.content.res.ColorStateList;
import android.content.res.Resources.Theme;
import android.os.Bundle;
import android.util.Log;
import android.util.Pair;
import android.util.TypedValue;
import android.view.KeyEvent;
import android.view.LayoutInflater;
@@ -854,12 +855,11 @@ public class ChooseLockPattern extends SettingsActivity {
}
@Override
protected Intent saveAndVerifyInBackground() {
Intent result = null;
protected Pair<Boolean, Intent> saveAndVerifyInBackground() {
final int userId = mUserId;
mUtils.saveLockPattern(mChosenPattern, mCurrentPattern, userId);
if (mHasChallenge) {
final boolean success = mUtils.saveLockPattern(mChosenPattern, mCurrentPattern, userId);
Intent result = null;
if (success && mHasChallenge) {
byte[] token;
try {
token = mUtils.verifyPattern(mChosenPattern, mChallenge, userId);
@@ -874,8 +874,7 @@ public class ChooseLockPattern extends SettingsActivity {
result = new Intent();
result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
}
return result;
return Pair.create(success, result);
}
@Override