diff options
Diffstat (limited to 'src/com/android/settings/ConfirmLockPassword.java')
| -rw-r--r-- | src/com/android/settings/ConfirmLockPassword.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java index 52aa1d975..54acf731e 100644 --- a/src/com/android/settings/ConfirmLockPassword.java +++ b/src/com/android/settings/ConfirmLockPassword.java @@ -44,6 +44,9 @@ import android.widget.TextView.OnEditorActionListener; public class ConfirmLockPassword extends SettingsActivity { + public static class InternalActivity extends ConfirmLockPassword { + } + @Override public Intent getIntent() { Intent modIntent = new Intent(super.getIntent()); @@ -168,10 +171,12 @@ public class ConfirmLockPassword extends SettingsActivity { if (mLockPatternUtils.checkPassword(pin)) { Intent intent = new Intent(); - intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE, - mIsAlpha ? StorageManager.CRYPT_TYPE_PASSWORD - : StorageManager.CRYPT_TYPE_PIN); - intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pin); + if (getActivity() instanceof ConfirmLockPassword.InternalActivity) { + intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE, + mIsAlpha ? StorageManager.CRYPT_TYPE_PASSWORD + : StorageManager.CRYPT_TYPE_PIN); + intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD, pin); + } getActivity().setResult(RESULT_OK, intent); getActivity().finish(); |