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

Don't launch ConfirmDeviceCredentials multiple times.

Browse Source 
Fixes bug 18724944

Change-Id: Ifd93b1632f120a2d17136b3100e2563fbb45b9a5
This commit is contained in:
Jim Miller
2015-07-20 15:36:21 -07:00
parent 4dd637a07e
commit 0c6e18f24d
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/ConfirmDeviceCredentialActivity.java
View File

@@ -58,12 +58,15 @@ public class ConfirmDeviceCredentialActivity extends Activity {
String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE); String title = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION); String details = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this); // Ignore rotates and ensure we only launch this once
if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title, if (savedInstanceState == null) {
details, false /* returnCredentials */, true /* isExternal */)) { ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
Log.d(TAG, "No pattern, password or PIN set."); if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,
setResult(Activity.RESULT_OK); details, false /* returnCredentials */, true /* isExternal */)) {
finish(); Log.d(TAG, "No pattern, password or PIN set.");
setResult(Activity.RESULT_OK);
finish();
}
} }
} }