Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 029a49cf authored Feb 14, 2023 by Xiang Wang Committed by Automerger Merge Worker Feb 14, 2023

Merge "Generate toString for Thermal AIDL parcelable" am: 5b7246bc am: 8acbd590 am: 32287b48

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2427637

Change-Id: I90d98e902d39a6861cfa16b3297be06093d925c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents f08f437e 32287b48

thermal/aidl/aidl_api/android.hardware.thermal/current/android/hardware/thermal/CoolingDevice.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@

		package android.hardware.thermal;
		/* @hide */
		@VintfStability
		@JavaDerive(toString=true) @VintfStability
		parcelable CoolingDevice {
		android.hardware.thermal.CoolingType type;
		String name;

thermal/aidl/aidl_api/android.hardware.thermal/current/android/hardware/thermal/Temperature.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@

		package android.hardware.thermal;
		/* @hide */
		@VintfStability
		@JavaDerive(toString=true) @VintfStability
		parcelable Temperature {
		android.hardware.thermal.TemperatureType type;
		String name;

thermal/aidl/aidl_api/android.hardware.thermal/current/android/hardware/thermal/TemperatureThreshold.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@

		package android.hardware.thermal;
		/* @hide */
		@VintfStability
		@JavaDerive(toString=true) @VintfStability
		parcelable TemperatureThreshold {
		android.hardware.thermal.TemperatureType type;
		String name;

thermal/aidl/android/hardware/thermal/CoolingDevice.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.hardware.thermal.CoolingType;

		/* @hide */
		@VintfStability
		@JavaDerive(toString=true)
		parcelable CoolingDevice {
		/**
		* This cooling device type, CPU, GPU, BATTERY, and etc.

thermal/aidl/android/hardware/thermal/Temperature.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.hardware.thermal.ThrottlingSeverity;

		/* @hide */
		@VintfStability
		@JavaDerive(toString=true)
		parcelable Temperature {
		/**
		* This temperature's type.