Add a missing null object check
We now have a null object instead of null values and
there was a place where we returned null instead of
the correct null object.
bug:28423485
Change-Id: I2626768acdf8d19fc94aa5e978eb057818450fa5
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index db720bb..5ff9c0c 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -846,7 +846,7 @@
// Special case for location (sigh).
if (isLocationProvidersAllowedRestricted(name, callingUserId, owningUserId)) {
- return null;
+ continue;
}
Setting setting = mSettingsRegistry.getSettingLocked(
@@ -871,7 +871,8 @@
// Special case for location (sigh).
if (isLocationProvidersAllowedRestricted(name, callingUserId, owningUserId)) {
- return null;
+ return mSettingsRegistry.getSettingsLocked(SETTINGS_TYPE_SECURE,
+ owningUserId).getNullSetting();
}
// Get the value.
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
index 6dfd0e6..2de0618c 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
@@ -16,7 +16,6 @@
package com.android.providers.settings;
-import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.os.SystemClock;
@@ -159,6 +158,10 @@
return mVersion;
}
+ public Setting getNullSetting() {
+ return mNullSetting;
+ }
+
// The settings provider must hold its lock when calling here.
public void setVersionLocked(int version) {
if (version == mVersion) {