diff options
| author | LuK1337 <priv.luk@gmail.com> | 2016-05-24 17:51:54 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-05-24 08:53:07 -0700 |
| commit | 477dca6c3bc6064aac635a661ef7ab6c83bc7c3c (patch) | |
| tree | e0865d6417b8dfeda4e85b334ac3226da4b4ad6b /src/com/android/settings/SecuritySettings.java | |
| parent | 6f68d2e4ffe3a56e631bc166740166608ef39dc9 (diff) | |
| download | packages_apps_Settings-477dca6c3bc6064aac635a661ef7ab6c83bc7c3c.zip packages_apps_Settings-477dca6c3bc6064aac635a661ef7ab6c83bc7c3c.tar.gz packages_apps_Settings-477dca6c3bc6064aac635a661ef7ab6c83bc7c3c.tar.bz2 | |
Fix NPE when user has his lockscreen set to "None"
Change-Id: Ib4d9612de740009f68f995fdb00c0e5bb38858f6
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
| -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 9305f0a..0fd5d2c 100644 --- a/src/com/android/settings/SecuritySettings.java +++ b/src/com/android/settings/SecuritySettings.java @@ -364,7 +364,7 @@ public class SecuritySettings extends SettingsPreferenceFragment // only show blur setting for devices that support it boolean blurSupported = getResources().getBoolean( com.android.internal.R.bool.config_ui_blur_enabled); - if (!blurSupported) { + if (!blurSupported && generalCategory != null) { Preference blurEnabledPref = generalCategory.findPreference(KEY_LOCK_SCREEN_BLUR); if (blurEnabledPref != null) generalCategory.removePreference(blurEnabledPref); } |