diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-10 14:40:19 +0100 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-10 14:40:19 +0100 |
| commit | 81f950f980bf9e449fb8051963185078b4b4af78 (patch) | |
| tree | 2581a5b829175bbeb5d74633c37a117c3c243c12 /src/com/android/settings/ChooseLockGeneric.java | |
| parent | 56911f102a2e2179278c804a04e36e4e96799632 (diff) | |
| download | packages_apps_Settings-81f950f980bf9e449fb8051963185078b4b4af78.zip packages_apps_Settings-81f950f980bf9e449fb8051963185078b4b4af78.tar.gz packages_apps_Settings-81f950f980bf9e449fb8051963185078b4b4af78.tar.bz2 | |
settings: Avoid an NPE
Change-Id: I81281703ee590d0c9dc5961832c0195eccb3175f
Diffstat (limited to 'src/com/android/settings/ChooseLockGeneric.java')
| -rw-r--r-- | src/com/android/settings/ChooseLockGeneric.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/ChooseLockGeneric.java b/src/com/android/settings/ChooseLockGeneric.java index 44a5c51..7f5960f 100644 --- a/src/com/android/settings/ChooseLockGeneric.java +++ b/src/com/android/settings/ChooseLockGeneric.java @@ -242,7 +242,8 @@ public class ChooseLockGeneric extends SettingsActivity { mWaitingForConfirmation = false; if (requestCode == CONFIRM_EXISTING_REQUEST && resultCode == Activity.RESULT_OK) { mPasswordConfirmed = true; - mUserPassword = data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD); + mUserPassword = data == null ? null : + data.getStringExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD); updatePreferencesOrFinish(); } else if (requestCode == ENABLE_ENCRYPTION_REQUEST && resultCode == Activity.RESULT_OK) { |