diff options
author | Andy Stadler <stadler@google.com> | 2011-02-01 16:22:41 -0800 |
---|---|---|
committer | Andy Stadler <stadler@google.com> | 2011-02-01 16:22:41 -0800 |
commit | 95ef5575a2b70d8c018f99b218353c925a70d418 (patch) | |
tree | d231297058d21c72aa2f02a6af151594a09caa18 /src/com/android/settings/CryptKeeperSettings.java | |
parent | 1499740c13af5fbd5766a87825c3e789b37bab24 (diff) | |
download | packages_apps_Settings-95ef5575a2b70d8c018f99b218353c925a70d418.zip packages_apps_Settings-95ef5575a2b70d8c018f99b218353c925a70d418.tar.gz packages_apps_Settings-95ef5575a2b70d8c018f99b218353c925a70d418.tar.bz2 |
Prevent NPE in onActivityResult
We're returning here in an unexpected condition; Treat all inputs
as suspect and verify before proceeding.
Bug: 3399579
Change-Id: I389bd0528f8bc721afb5a9c4646a2e23fde77f77
Diffstat (limited to 'src/com/android/settings/CryptKeeperSettings.java')
-rw-r--r-- | src/com/android/settings/CryptKeeperSettings.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java index 01ef3f2..10fa8ac 100644 --- a/src/com/android/settings/CryptKeeperSettings.java +++ b/src/com/android/settings/CryptKeeperSettings.java @@ -31,6 +31,7 @@ import android.os.BatteryManager; import android.os.Bundle; import android.preference.Preference; import android.preference.PreferenceActivity; +import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -184,9 +185,11 @@ public class CryptKeeperSettings extends Fragment { // If the user entered a valid keyguard trace, present the final // confirmation prompt; otherwise, go back to the initial state. - if (resultCode == Activity.RESULT_OK) { + if (resultCode == Activity.RESULT_OK && data != null) { String password = data.getStringExtra("password"); - showFinalConfirmation(password); + if (!TextUtils.isEmpty(password)) { + showFinalConfirmation(password); + } } } |