drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace null checks is null object checks" into nyc-dev am: cab5164

Browse Source 
am: 9fe1826

* commit '9fe1826fb70d9f4d8d98698bd87aa88066443cd0':
  Replace null checks is null object checks

Change-Id: I6344247095bda1ba4da9d2bd98442af2cc956c25
This commit is contained in:
Svetoslav Ganov
2016-04-27 01:49:53 +00:00
committed by android-build-merger
parent 3fd1f25b0c 9fe1826fb7
commit e9d729855c
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();