Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a missing null check

Browse Source 
am: 6f8a10b

* commit '6f8a10bd14d927f9603823c06a3e53f56392ba95':
  Add a missing null check

Change-Id: Ib40480e3dcc7cb752c2d114035ebd64f15ea28d5
This commit is contained in:
Svet Ganov
2016-04-27 06:20:06 +00:00
committed by android-build-merger
parent 09ab9a0ca1 6f8a10bd14
commit 9931dc6c88
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -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,