commit 3977df037c1cdd1bef92e3f4195c6e7b847a1c28
author Jim Miller <jaggies@google.com> Mon Jul 20 22:50:29 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 20 22:50:30 2015 +0000
tree e4d4d7288f1e2628ea7f0759c4439f3d9dceaec1
parent 1992d5a1fc616f5132315ee6d4659c20728acad6
parent 0c6e18f24d846d40c5800bbfede83675321f349a

Merge "Don't launch ConfirmDeviceCredentials multiple times." into mnc-dev

src/com/android/settings/ConfirmDeviceCredentialActivity.java

diff --git a/src/com/android/settings/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
index 7653603..da39a0f 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialActivity.java
@@ -58,12 +58,15 @@
         String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
         String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
 
-        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
-        if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,
-                details, false /* returnCredentials */, true /* isExternal */)) {
-            Log.d(TAG, "No pattern, password or PIN set.");
-            setResult(Activity.RESULT_OK);
-            finish();
+        // Ignore rotates and ensure we only launch this once
+        if (savedInstanceState == null) {
+            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
+            if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,
+                    details, false /* returnCredentials */, true /* isExternal */)) {
+                Log.d(TAG, "No pattern, password or PIN set.");
+                setResult(Activity.RESULT_OK);
+                finish();
+            }
         }
     }