Merge "Migrate remote configuration to DeviceConfig." (e11aa0c7) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -8411,6 +8411,7 @@ package android.provider {
		field public static final String NAMESPACE_APP_COMPAT = "app_compat";
		field public static final String NAMESPACE_ATTENTION_MANAGER_SERVICE = "attention_manager_service";
		field public static final String NAMESPACE_AUTOFILL = "autofill";
		field public static final String NAMESPACE_BATTERY_SAVER = "battery_saver";
		field public static final String NAMESPACE_BIOMETRICS = "biometrics";
		field public static final String NAMESPACE_BLOBSTORE = "blobstore";
		field public static final String NAMESPACE_BLUETOOTH = "bluetooth";

+8 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,14 @@ public final class DeviceConfig {
		@SystemApi
		public static final String NAMESPACE_AUTOFILL = "autofill";

		/**
		* Namespace for battery saver feature.
		*
		* @hide
		*/
		@SystemApi
		public static final String NAMESPACE_BATTERY_SAVER = "battery_saver";

		/**
		* Namespace for blobstore feature that allows apps to share data blobs.
		*

+0 −18

Original line number	Diff line number	Diff line
		@@ -11716,24 +11716,6 @@ public final class Settings {
		public static final String BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS =
		"battery_saver_device_specific_constants";

		/**
		* Settings for adaptive Battery Saver mode. Uses the same flags as
		* {@link #BATTERY_SAVER_CONSTANTS}.
		*
		* @hide
		*/
		public static final String BATTERY_SAVER_ADAPTIVE_CONSTANTS =
		"battery_saver_adaptive_constants";

		/**
		* Device specific settings for adaptive Battery Saver mode. Uses the same flags as
		* {@link #BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS}.
		*
		* @hide
		*/
		public static final String BATTERY_SAVER_ADAPTIVE_DEVICE_SPECIFIC_CONSTANTS =
		"battery_saver_adaptive_device_specific_constants";

		/**
		* Battery tip specific settings
		* This is encoded as a key=value list, separated by commas. Ex:

+0 −2

Original line number	Diff line number	Diff line
		@@ -146,7 +146,6 @@ public class SettingsBackupTest {
		Settings.Global.BROADCAST_OFFLOAD_CONSTANTS,
		Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD,
		Settings.Global.BATTERY_DISCHARGE_THRESHOLD,
		Settings.Global.BATTERY_SAVER_ADAPTIVE_DEVICE_SPECIFIC_CONSTANTS,
		Settings.Global.BATTERY_SAVER_DEVICE_SPECIFIC_CONSTANTS,
		Settings.Global.BATTERY_STATS_CONSTANTS,
		Settings.Global.BINDER_CALLS_STATS,
		@@ -232,7 +231,6 @@ public class SettingsBackupTest {
		Settings.Global.DEVELOPMENT_USE_BLAST_ADAPTER_VR,
		Settings.Global.DEVELOPMENT_WM_DISPLAY_SETTINGS_PATH,
		Settings.Global.DEVICE_DEMO_MODE,
		Settings.Global.BATTERY_SAVER_ADAPTIVE_CONSTANTS,
		Settings.Global.BATTERY_SAVER_CONSTANTS,
		Settings.Global.BATTERY_TIP_CONSTANTS,
		Settings.Global.DEFAULT_SM_DP_PLUS,

+0 −6

Original line number	Diff line number	Diff line
		@@ -368,12 +368,6 @@ public class BatterySaverController implements BatterySaverPolicyListener {
		}
		}

		boolean setAdaptivePolicyLocked(String settings, String deviceSpecificSettings, int reason) {
		return setAdaptivePolicyLocked(
		BatterySaverPolicy.Policy.fromSettings(settings, deviceSpecificSettings),
		reason);
		}

		boolean setAdaptivePolicyLocked(BatterySaverPolicyConfig config, int reason) {
		return setAdaptivePolicyLocked(BatterySaverPolicy.Policy.fromConfig(config), reason);
		}