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

Don't show RedactionInterstitial when changing password

Browse Source 
Only show when going from an insecure to secure lock.

Bug: 18467783
Change-Id: Ia73682d45b1dcd9ad61a00abeac099a94256e3b7
This commit is contained in:
Adrian Roos
2014-11-24 17:17:13 +01:00
parent 239d185aa7
commit 90d6c568cf
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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