Don't show RedactionInterstitial when changing password

Only show when going from an insecure to secure lock.

Bug: 18467783
Change-Id: Ia73682d45b1dcd9ad61a00abeac099a94256e3b7

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 3d3ef16..2c3beef 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -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()));
+            }
         }
     }
 }