From 6f8a10bd14d927f9603823c06a3e53f56392ba95 Mon Sep 17 00:00:00 2001 From: Svet Ganov Date: Tue, 26 Apr 2016 23:05:31 -0700 Subject: [PATCH] Add a missing null check We no longer have a null settings value - instead it is a null object. This change adds a missing null check that is not changed to check against the null object. bug:28406262 Change-Id: I5a40675dd226564c0ee190d0d6f7eb2a7e4673b0 --- .../com/android/providers/settings/SettingsProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index bb806361a4cf1..7bea56628fedc 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1907,7 +1907,7 @@ public class SettingsProvider extends ContentProvider { private void ensureSecureSettingAndroidIdSetLocked(SettingsState secureSettings) { Setting value = secureSettings.getSettingLocked(Settings.Secure.ANDROID_ID); - if (value != null) { + if (value.isNull()) { return; } @@ -2300,7 +2300,7 @@ public class SettingsProvider extends ContentProvider { final Setting showNotifications = systemSecureSettings.getSettingLocked( Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS); - if (showNotifications != null) { + if (showNotifications.isNull()) { final SettingsState secureSettings = getSecureSettingsLocked(userId); secureSettings.insertSettingLocked( Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, @@ -2310,7 +2310,7 @@ public class SettingsProvider extends ContentProvider { final Setting allowPrivate = systemSecureSettings.getSettingLocked( Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS); - if (allowPrivate != null) { + if (allowPrivate.isNull()) { final SettingsState secureSettings = getSecureSettingsLocked(userId); secureSettings.insertSettingLocked( Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,