Merge "Migrate AppStandbyController to DeviceConfig." (6dac7fd2) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+237 −168

File changed.

Preview size limit exceeded, changes collapsed.

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -185,6 +185,7 @@ package android.provider {

	public final class DeviceConfig {		public final class DeviceConfig {
	field public static final String NAMESPACE_ALARM_MANAGER = "alarm_manager";		field public static final String NAMESPACE_ALARM_MANAGER = "alarm_manager";
			field public static final String NAMESPACE_APP_STANDBY = "app_standby";
	field public static final String NAMESPACE_DEVICE_IDLE = "device_idle";		field public static final String NAMESPACE_DEVICE_IDLE = "device_idle";
	}		}

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -100,6 +100,14 @@ public final class DeviceConfig {
	@SystemApi		@SystemApi
	public static final String NAMESPACE_APP_COMPAT = "app_compat";		public static final String NAMESPACE_APP_COMPAT = "app_compat";

			/**
			* Namespace for app standby configurations.
			*
			* @hide
			*/
			@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
			public static final String NAMESPACE_APP_STANDBY = "app_standby";

	/**		/**
	* Namespace for AttentionManagerService related features.		* Namespace for AttentionManagerService related features.
	*		*

+0 −31

Original line number	Original line	Diff line number	Diff line
	@@ -11831,37 +11831,6 @@ public final class Settings {
	*/		*/
	public static final String APP_TIME_LIMIT_USAGE_SOURCE = "app_time_limit_usage_source";		public static final String APP_TIME_LIMIT_USAGE_SOURCE = "app_time_limit_usage_source";

	/**
	* App standby (app idle) specific settings.
	* This is encoded as a key=value list, separated by commas. Ex:
	* <p>
	* "idle_duration=5000,prediction_timeout=4500,screen_thresholds=0/0/60000/120000"
	* <p>
	* All durations are in millis.
	* Array values are separated by forward slashes
	* The following keys are supported:
	*
	* <pre>
	* screen_thresholds (long[4])
	* elapsed_thresholds (long[4])
	* strong_usage_duration (long)
	* notification_seen_duration (long)
	* system_update_usage_duration (long)
	* prediction_timeout (long)
	* sync_adapter_duration (long)
	* exempted_sync_duration (long)
	* system_interaction_duration (long)
	* initial_foreground_service_start_duration (long)
	* cross_profile_apps_share_standby_buckets (boolean)
	* </pre>
	*
	* <p>
	* Type: string
	* @hide
	* @see com.android.server.usage.AppStandbyController
	*/
	public static final String APP_IDLE_CONSTANTS = "app_idle_constants";

	/**		/**
	* Enable ART bytecode verification verifications for debuggable apps.		* Enable ART bytecode verification verifications for debuggable apps.
	* 0 = disable, 1 = enable.		* 0 = disable, 1 = enable.

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,7 @@ message ConfigSettingsProto {
	repeated SettingProto activity_manager_settings = 4;		repeated SettingProto activity_manager_settings = 4;
	repeated SettingProto alarm_manager_settings = 26;		repeated SettingProto alarm_manager_settings = 26;
	repeated SettingProto app_compat_settings = 5;		repeated SettingProto app_compat_settings = 5;
			repeated SettingProto app_standby_settings = 27;
	repeated SettingProto autofill_settings = 6;		repeated SettingProto autofill_settings = 6;
	repeated SettingProto blobstore_settings = 23;		repeated SettingProto blobstore_settings = 23;
	repeated SettingProto connectivity_settings = 7;		repeated SettingProto connectivity_settings = 7;
	@@ -52,7 +53,7 @@ message ConfigSettingsProto {
	repeated SettingProto telephony_settings = 21;		repeated SettingProto telephony_settings = 21;
	repeated SettingProto textclassifier_settings = 22;		repeated SettingProto textclassifier_settings = 22;

	// Next tag: 27		// Next tag: 28

	message NamespaceProto {		message NamespaceProto {
	optional string namespace = 1;		optional string namespace = 1;