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

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

@@ -58,6 +58,8 @@ 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);
// Ignore rotates and ensure we only launch this once
if (savedInstanceState == null) {
ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this); ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title, if (!helper.launchConfirmationActivity(0 /* request code */, null /* title */, title,
details, false /* returnCredentials */, true /* isExternal */)) { details, false /* returnCredentials */, true /* isExternal */)) {
@@ -66,6 +68,7 @@ public class ConfirmDeviceCredentialActivity extends Activity {
finish(); finish();
} }
} }
}
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {