Merge "Remove headroom selection type and move interval to support info" into main (e7b812b7) · Commits · e / os / android_hardware_interfaces

power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/CpuHeadroomParams.aidl

+0 −5

Original line number	Diff line number	Diff line
		@@ -36,14 +36,9 @@ package android.hardware.power;
		parcelable CpuHeadroomParams {
		android.hardware.power.CpuHeadroomParams.CalculationType calculationType = android.hardware.power.CpuHeadroomParams.CalculationType.MIN;
		int calculationWindowMillis = 1000;
		android.hardware.power.CpuHeadroomParams.SelectionType selectionType = android.hardware.power.CpuHeadroomParams.SelectionType.ALL;
		int[] tids;
		enum CalculationType {
		MIN,
		AVERAGE,
		}
		enum SelectionType {
		ALL,
		PER_CORE,
		}
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -35,5 +35,4 @@ package android.hardware.power;
		@JavaDerive(equals=true, toString=true) @VintfStability
		union CpuHeadroomResult {
		float globalHeadroom;
		float[] perCoreHeadroom;
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -46,8 +46,6 @@ interface IPower {
		android.hardware.power.SupportInfo getSupportInfo();
		android.hardware.power.CpuHeadroomResult getCpuHeadroom(in android.hardware.power.CpuHeadroomParams params);
		android.hardware.power.GpuHeadroomResult getGpuHeadroom(in android.hardware.power.GpuHeadroomParams params);
		long getCpuHeadroomMinIntervalMillis();
		long getGpuHeadroomMinIntervalMillis();
		oneway void sendCompositionData(in android.hardware.power.CompositionData[] data);
		oneway void sendCompositionUpdate(in android.hardware.power.CompositionUpdate update);
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ parcelable SupportInfo {
		long sessionModes;
		long sessionTags;
		android.hardware.power.SupportInfo.CompositionDataSupportInfo compositionData;
		android.hardware.power.SupportInfo.HeadroomSupportInfo headroom;
		@VintfStability
		parcelable CompositionDataSupportInfo {
		boolean isSupported;
		@@ -48,4 +49,11 @@ parcelable SupportInfo {
		int maxBatchSize;
		boolean alwaysBatch;
		}
		@VintfStability
		parcelable HeadroomSupportInfo {
		boolean isCpuSupported;
		boolean isGpuSupported;
		int cpuMinIntervalMillis;
		int gpuMinIntervalMillis;
		}
		}

+0 −15

Original line number	Diff line number	Diff line
		@@ -41,21 +41,6 @@ parcelable CpuHeadroomParams {
		*/
		int calculationWindowMillis = 1000;

		/**
		* Defines how to select the CPU.
		*/
		enum SelectionType {
		// Default to return a single value for all cores.
		ALL,
		// Returns per-core headroom in a list.
		PER_CORE,
		}

		/**
		* The CPU selection type.
		*/
		SelectionType selectionType = SelectionType.ALL;

		/**
		* The thread TIDs to track.
		*