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

am b3e88b6e: am 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev

Browse Source 
* commit 'b3e88b6e209992b5ce8dabfb95bb5dfb6aa79425':
  Don't show RedactionInterstitial when changing password
This commit is contained in:
Adrian Roos
2014-11-25 18:45:43 +00:00
committed by Android Git Automerger
parent e289815ec0 b3e88b6e20
commit 9fc6bf3f37
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/ChooseLockPassword.java
View File

@@ -425,6 +425,7 @@ public class ChooseLockPassword extends SettingsActivity {
if (mFirstPin.equals(pin)) {
final boolean isFallback = getActivity().getIntent().getBooleanExtra(
LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
boolean wasSecureBefore = mLockPatternUtils.isSecure();
mLockPatternUtils.clearLock(isFallback);
final boolean required = getActivity().getIntent().getBooleanExtra(
EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
@@ -433,7 +434,9 @@ public class ChooseLockPassword extends SettingsActivity {
getActivity().setResult(RESULT_FINISHED);
getActivity().finish();
mDone = true;
startActivity(RedactionInterstitial.createStartIntent(getActivity()));
if (!wasSecureBefore) {
startActivity(RedactionInterstitial.createStartIntent(getActivity()));
}
} else {
CharSequence tmp = mPasswordEntry.getText();
if (tmp != null) {

6
src/com/android/settings/ChooseLockPattern.java
View File

@@ -540,6 +540,8 @@ public class ChooseLockPattern extends SettingsActivity {
final boolean isFallback = getActivity().getIntent()
.getBooleanExtra(LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
boolean wasSecureBefore = utils.isSecure();
final boolean required = getActivity().getIntent().getBooleanExtra(
EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true);
utils.setCredentialRequiredToDecrypt(required);
@@ -553,7 +555,9 @@ public class ChooseLockPattern extends SettingsActivity {
getActivity().setResult(RESULT_FINISHED);
getActivity().finish();
mDone = true;
startActivity(RedactionInterstitial.createStartIntent(getActivity()));
if (!wasSecureBefore) {
startActivity(RedactionInterstitial.createStartIntent(getActivity()));
}
}
}
}