Merge "Cleaning up frameworks protos." into pi-dev am: 4738c7d0ab (10b25077) · Commits · e / os / android_frameworks_base

core/proto/android/server/animationadapter.proto

+22 −22

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ message MoveAnimationSpecProto {

		optional .android.graphics.PointProto from = 1;
		optional .android.graphics.PointProto to = 2;
		optional int64 duration = 3;
		optional int64 duration_ms = 3;
		}

		/* represents AlphaAnimationSpec */
		@@ -74,5 +74,5 @@ message AlphaAnimationSpecProto {

		optional float from = 1;
		optional float to = 2;
		optional int64 duration = 3;
		optional int64 duration_ms = 3;
		}

core/proto/android/server/jobscheduler.proto

+10 −28

Original line number	Diff line number	Diff line
		@@ -219,23 +219,6 @@ message ConstantsProto {
		message StateControllerProto {
		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

		message AppIdleController {
		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

		optional bool is_parole_on = 1;

		message TrackedJob {
		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

		optional JobStatusShortInfoProto info = 1;
		optional int32 source_uid = 2;
		optional string source_package_name = 3;
		// If the constraints are satisfied, then the controller will mark
		// the job as RUNNABLE, otherwise, it will be WAITING.
		optional bool are_constraints_satisfied = 4;
		}
		repeated TrackedJob tracked_jobs = 2;
		}
		message BackgroundJobsController {
		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

		@@ -413,15 +396,14 @@ message StateControllerProto {
		repeated TrackedJob tracked_jobs = 4;
		}
		oneof controller {
		AppIdleController app_idle = 1;
		BackgroundJobsController background = 2;
		BatteryController battery = 3;
		ConnectivityController connectivity = 4;
		ContentObserverController content_observer = 5;
		DeviceIdleJobsController device_idle = 6;
		IdleController idle = 7;
		StorageController storage = 8;
		TimeController time = 9;
		BackgroundJobsController background = 1;
		BatteryController battery = 2;
		ConnectivityController connectivity = 3;
		ContentObserverController content_observer = 4;
		DeviceIdleJobsController device_idle = 5;
		IdleController idle = 6;
		StorageController storage = 7;
		TimeController time = 8;
		}
		}

		@@ -618,8 +600,8 @@ message JobStatusDumpProto {
		CONSTRAINT_DEADLINE = 5;
		CONSTRAINT_IDLE = 6;
		CONSTRAINT_CONNECTIVITY = 7;
		CONSTRAINT_CONTENT_TRIGGER = 9;
		CONSTRAINT_DEVICE_NOT_DOZING = 10;
		CONSTRAINT_CONTENT_TRIGGER = 8;
		CONSTRAINT_DEVICE_NOT_DOZING = 9;
		}
		repeated Constraint required_constraints = 7;
		repeated Constraint satisfied_constraints = 8;

core/proto/android/server/powermanagerservice.proto

+28 −23

Original line number	Diff line number	Diff line
		@@ -313,6 +313,8 @@ message PowerServiceSettingsAndConfigurationDumpProto {
		}

		message BatterySaverStateMachineProto {
		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

		// Whether battery saver is enabled.
		optional bool enabled = 1;

		@@ -337,12 +339,15 @@ message BatterySaverStateMachineProto {
		// Whether battery level is low or not.
		optional bool is_battery_level_low = 8;

		// The value of Global.LOW_POWER_MODE.
		// The value of Global.LOW_POWER_MODE. This is a cached value, so it could
		// be slightly different from what's in GlobalSettingsProto.LowPowerMode.
		optional bool setting_battery_saver_enabled = 9;

		// The value of Global.LOW_POWER_MODE_STICKY.
		// The value of Global.LOW_POWER_MODE_STICKY. This is a cached value, so it could
		// be slightly different from what's in GlobalSettingsProto.LowPowerMode.
		optional bool setting_battery_saver_enabled_sticky = 10;

		// The value of Global.LOW_POWER_MODE_TRIGGER_LEVEL.
		// The value of Global.LOW_POWER_MODE_TRIGGER_LEVEL. This is a cached value, so it could
		// be slightly different from what's in GlobalSettingsProto.LowPowerMode.
		optional int32 setting_battery_saver_trigger_threshold = 11;
		}

core/proto/android/server/surfaceanimator.proto

+5 −6

Original line number	Diff line number	Diff line
		@@ -29,8 +29,7 @@ option java_multiple_files = true;
		message SurfaceAnimatorProto {
		option (.android.msg_privacy).dest = DEST_AUTOMATIC;

		reserved 1; // Was string animation_adapter = 1
		optional .android.view.SurfaceControlProto leash = 2;
		optional bool animation_start_delayed = 3;
		optional AnimationAdapterProto animation_adapter = 4;
		optional .android.view.SurfaceControlProto leash = 1;
		optional bool animation_start_delayed = 2;
		optional AnimationAdapterProto animation_adapter = 3;
		}

core/proto/android/view/windowlayoutparams.proto

+42 −38

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ message WindowLayoutParamsProto {
		optional float alpha = 12;
		optional float screen_brightness = 13;
		optional float button_brightness = 14;

		enum RotationAnimation {
		ROTATION_ANIMATION_UNSPECIFIED = -1;
		ROTATION_ANIMATION_CROSSFADE = 1;
		@@ -48,17 +49,20 @@ message WindowLayoutParamsProto {
		ROTATION_ANIMATION_SEAMLESS = 3;
		}
		optional RotationAnimation rotation_animation = 15;

		optional float preferred_refresh_rate = 16;
		optional int32 preferred_display_mode_id = 17;
		optional bool has_system_ui_listeners = 18;
		optional uint32 input_feature_flags = 19;
		optional int64 user_activity_timeout = 20;

		enum NeedsMenuState {
		NEEDS_MENU_UNSET = 0;
		NEEDS_MENU_SET_TRUE = 1;
		NEEDS_MENU_SET_FALSE = 2;
		}
		optional NeedsMenuState needs_menu_key = 22;

		optional .android.view.DisplayProto.ColorMode color_mode = 23;
		optional uint32 flags = 24;
		optional uint32 private_flags = 26;