Merge "Always add legacy DeviceConfigService to ServiceManager" (40fc2860) · Commits · e / os / android_frameworks_base

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

+1 −8

Original line number	Diff line number	Diff line
		@@ -97,7 +97,6 @@ import android.provider.Settings.Config.SyncDisabledMode;
		import android.provider.Settings.Global;
		import android.provider.Settings.Secure;
		import android.provider.Settings.SetAllResult;
		import android.provider.UpdatableDeviceConfigServiceReadiness;
		import android.provider.settings.validators.SystemSettingsValidators;
		import android.provider.settings.validators.Validator;
		import android.text.TextUtils;
		@@ -419,14 +418,8 @@ public class SettingsProvider extends ContentProvider {
		startWatchingUserRestrictionChanges();
		});
		ServiceManager.addService("settings", new SettingsService(this));
		addDeviceConfigServiceIfNeeded();
		return true;
		}

		private void addDeviceConfigServiceIfNeeded() {
		if (!UpdatableDeviceConfigServiceReadiness.shouldStartUpdatableService()) {
		ServiceManager.addService("device_config", new DeviceConfigService(this));
		}
		return true;
		}

		@Override