From 6e5b602552b15ab95dc7b1e4e824f8da6a951fcf Mon Sep 17 00:00:00 2001 From: Seigo Nonaka Date: Wed, 27 Apr 2016 16:32:44 +0900 Subject: [PATCH] Fix unexpected null check condition flipping. With I5a40675dd226564c0ee190d0d6f7eb2a7e4673b0, isNull() is used for null check but accidentally the condition is flipped. Bug:28406262 Change-Id: I776a6c259765210a7b334a81876233b594fd25ed --- .../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 7bea56628fedc..db720bb52558b 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.isNull()) { + 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.isNull()) { + 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.isNull()) { + if (!allowPrivate.isNull()) { final SettingsState secureSettings = getSecureSettingsLocked(userId); secureSettings.insertSettingLocked( Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS,