diff options
| author | Jim Miller <jaggies@google.com> | 2015-07-20 15:36:21 -0700 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2015-07-20 22:38:02 +0000 |
| commit | 0c6e18f24d846d40c5800bbfede83675321f349a (patch) | |
| tree | f0c76411d8b5143c1c5f70d19053461db5fe2807 /src/com/android/settings/ConfirmDeviceCredentialActivity.java | |
| parent | 4dd637a07e7eba9341d85c21fbb1fccac7e685c3 (diff) | |
| download | packages_apps_Settings-0c6e18f24d846d40c5800bbfede83675321f349a.zip packages_apps_Settings-0c6e18f24d846d40c5800bbfede83675321f349a.tar.gz packages_apps_Settings-0c6e18f24d846d40c5800bbfede83675321f349a.tar.bz2 | |
Don't launch ConfirmDeviceCredentials multiple times.
Fixes bug 18724944
Change-Id: Ifd93b1632f120a2d17136b3100e2563fbb45b9a5
Diffstat (limited to 'src/com/android/settings/ConfirmDeviceCredentialActivity.java')
| -rw-r--r-- | src/com/android/settings/ConfirmDeviceCredentialActivity.java | 15 |
1 files changed, 9 insertions, 6 deletions
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 @@ public class ConfirmDeviceCredentialActivity extends Activity { 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(); + } } } |