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

Replace null checks is null object checks

Browse Source 
A recent change replaced the null state during a setting
lookup with a null object, however missed to update some
null checks to be null object ones.

bug:28405145

Change-Id: I80f0fb3ac6e64f4283b6c617283a009e97a40efe
This commit is contained in:
Svetoslav Ganov
2016-04-26 18:36:42 -07:00
parent f71d7feef2
commit fedb230213
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1458,7 +1458,7 @@ public class SettingsProvider extends ContentProvider {
}
private static MatrixCursor packageSettingForQuery(Setting setting, String[] projection) {
if (setting == null) {
if (setting.isNull()) {
return new MatrixCursor(projection, 0);
}
MatrixCursor cursor = new MatrixCursor(projection, 1);
@@ -1483,7 +1483,7 @@ public class SettingsProvider extends ContentProvider {
}
private static void appendSettingToCursor(MatrixCursor cursor, Setting setting) {
if (setting == null) {
if (setting.isNull()) {
return;
}
final int columnCount = cursor.getColumnCount();
@@ -2210,7 +2210,7 @@ public class SettingsProvider extends ContentProvider {
Setting currentSetting = secureSettings.getSettingLocked(
Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT);
if (defaultComponent != null && !defaultComponent.isEmpty() &&
currentSetting == null) {
currentSetting.isNull()) {
secureSettings.insertSettingLocked(
Settings.Secure.NFC_PAYMENT_DEFAULT_COMPONENT,
defaultComponent,
@@ -2226,7 +2226,7 @@ public class SettingsProvider extends ContentProvider {
final SettingsState globalSettings = getGlobalSettingsLocked();
Setting currentSetting = globalSettings.getSettingLocked(
Settings.Global.ADD_USERS_WHEN_LOCKED);
if (currentSetting == null) {
if (currentSetting.isNull()) {
globalSettings.insertSettingLocked(
Settings.Global.ADD_USERS_WHEN_LOCKED,
getContext().getResources().getBoolean(
@@ -2252,7 +2252,7 @@ public class SettingsProvider extends ContentProvider {
final SettingsState secureSettings = getSecureSettingsLocked(userId);
Setting currentSetting = secureSettings.getSettingLocked(
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD);
if (currentSetting == null) {
if (currentSetting.isNull()) {
secureSettings.insertSettingLocked(
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD,
getContext().getResources().getBoolean(
@@ -2268,7 +2268,7 @@ public class SettingsProvider extends ContentProvider {
Setting currentSetting = secureSettings.getSettingLocked(
Settings.Secure.ENABLED_VR_LISTENERS);
if (currentSetting == null) {
if (currentSetting.isNull()) {
ArraySet<ComponentName> l =
SystemConfig.getInstance().getDefaultVrComponents();