Merge "Clean up Wear CPU scaling and swap experiments." (59ca58c1) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −19

Original line number	Diff line number	Diff line
		@@ -12848,16 +12848,6 @@ public final class Settings {
		public static final String ZRAM_ENABLED =
		"zram_enabled";

		/**
		* Whether we have enable CPU frequency scaling for this device.
		* For Wear, default is disable.
		*
		* The value is "1" for enable, "0" for disable.
		* @hide
		*/
		public static final String CPU_SCALING_ENABLED =
		"cpu_frequency_scaling_enabled";

		/**
		* Configuration flags for smart replies in notifications.
		* This is encoded as a key=value list, separated by commas. Ex:
		@@ -12944,15 +12934,6 @@ public final class Settings {
		public static final String BACKUP_AGENT_TIMEOUT_PARAMETERS =
		"backup_agent_timeout_parameters";

		/**
		* Whether we have enabled swapping on this device. For Wear, default is
		* enabled.
		*
		* The value is "1" for enable, "0" for disable.
		* @hide
		*/
		public static final String SWAP_ENABLED = "swap_enabled";

		/**
		* Blacklist of GNSS satellites.
		*

+0 −2

Original line number	Diff line number	Diff line
		@@ -176,7 +176,6 @@ public class SettingsBackupTest {
		Settings.Global.CONNECTIVITY_SAMPLING_INTERVAL_IN_SECONDS,
		Settings.Global.CONTACT_METADATA_SYNC_ENABLED,
		Settings.Global.CONTACTS_DATABASE_WAL_ENABLED,
		Settings.Global.CPU_SCALING_ENABLED,
		Settings.Global.DATA_ACTIVITY_TIMEOUT_MOBILE,
		Settings.Global.DATA_ACTIVITY_TIMEOUT_WIFI,
		Settings.Global.DATABASE_CREATION_BUILDID,
		@@ -403,7 +402,6 @@ public class SettingsBackupTest {
		Settings.Global.SQLITE_COMPATIBILITY_WAL_FLAGS,
		Settings.Global.STORAGE_BENCHMARK_INTERVAL,
		Settings.Global.STORAGE_SETTINGS_CLOBBER_THRESHOLD,
		Settings.Global.SWAP_ENABLED,
		Settings.Global.SYNC_MANAGER_CONSTANTS,
		Settings.Global.SYNC_MAX_RETRY_DELAY_IN_SECONDS,
		Settings.Global.SYS_FREE_STORAGE_LOG_INTERVAL,

+0 −6

Original line number	Diff line number	Diff line
		@@ -199,8 +199,6 @@ public final class SystemServer {
		"com.android.server.search.SearchManagerService$Lifecycle";
		private static final String THERMAL_OBSERVER_CLASS =
		"com.google.android.clockwork.ThermalObserver";
		private static final String WEAR_CONFIG_SERVICE_CLASS =
		"com.google.android.clockwork.WearConfigManagerService";
		private static final String WEAR_CONNECTIVITY_SERVICE_CLASS =
		"com.android.clockwork.connectivity.WearConnectivityService";
		private static final String WEAR_SIDEKICK_SERVICE_CLASS =
		@@ -1551,10 +1549,6 @@ public final class SystemServer {
		}

		if (isWatch) {
		traceBeginAndSlog("StartWearConfigService");
		mSystemServiceManager.startService(WEAR_CONFIG_SERVICE_CLASS);
		traceEnd();

		traceBeginAndSlog("StartWearConnectivityService");
		mSystemServiceManager.startService(WEAR_CONNECTIVITY_SERVICE_CLASS);
		traceEnd();