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
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.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 @@
// 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);
+ }
}
}