diff options
| -rw-r--r-- | src/com/android/settings/SecuritySettings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java index 17775ab6a..35131268a 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -196,7 +196,7 @@ public class SecuritySettings extends SettingsPreferenceFragment Bundle extras = getActivity().getIntent().getExtras(); // Even uglier hack to make cts verifier expectations make sense. - if (extras.get(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS) != null && + if (extras != null && extras.get(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS) != null && extras.get(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SHORTCUT) == null) { mFilterType = TYPE_EXTERNAL_RESOLUTION; } |