Merge "Add a missing null object check" into nyc-dev (44cc663f) · Commits · e / os / android_frameworks_base

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -846,7 +846,7 @@ public class SettingsProvider extends ContentProvider {

		// Special case for location (sigh).
		if (isLocationProvidersAllowedRestricted(name, callingUserId, owningUserId)) {
		return null;
		continue;
		}

		Setting setting = mSettingsRegistry.getSettingLocked(
		@@ -871,7 +871,8 @@ public class SettingsProvider extends ContentProvider {

		// Special case for location (sigh).
		if (isLocationProvidersAllowedRestricted(name, callingUserId, owningUserId)) {
		return null;
		return mSettingsRegistry.getSettingsLocked(SETTINGS_TYPE_SECURE,
		owningUserId).getNullSetting();
		}

		// Get the value.

+4 −1

Original line number	Diff line number	Diff line
		@@ -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 @@ final class SettingsState {
		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) {