diff options
| author | Michael W <baddaemon87@gmail.com> | 2016-06-18 21:50:37 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-06-21 14:09:02 -0700 |
| commit | 232e6673b183e6cc3c8e3ea971274d7f838b0d75 (patch) | |
| tree | 31c297af2e2a885050ee5e78189f82b047cb5f5f /src | |
| parent | b720488c606c9a0a5890aca8ebff11b8c98db457 (diff) | |
| download | packages_apps_Settings-232e6673b183e6cc3c8e3ea971274d7f838b0d75.zip packages_apps_Settings-232e6673b183e6cc3c8e3ea971274d7f838b0d75.tar.gz packages_apps_Settings-232e6673b183e6cc3c8e3ea971274d7f838b0d75.tar.bz2 | |
Settings: Fix possible NPE
extras seems to be null sometimes so the call to
extras.get() causes an NPE
Change-Id: I8a95da51aadda8fd6191131570a2f4b2bed762e7
Reference: BugDumps 13-20160610-16 L#64
Diffstat (limited to 'src')
| -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 17775ab..3513126 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; } |