thermal: support more temperature and cooling device type

Bug: 312540064
Test: build
Change-Id: I6e11a181a09640e3f597344dbcbb7571b7e49453
This commit is contained in:
TeYuan Wang 2023-11-21 14:58:20 -08:00 committed by Kame(TeYuan) Wang
parent 5c9de12274
commit 3d8c680f0a
9 changed files with 26 additions and 6 deletions

View file

@ -577,7 +577,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.thermal</name>
<version>1</version>
<version>2</version>
<interface>
<name>IThermal</name>
<instance>default</instance>

View file

@ -45,6 +45,6 @@ aidl_interface {
imports: [],
},
],
frozen: true,
frozen: false,
}

View file

@ -46,4 +46,8 @@ enum CoolingType {
POWER_AMPLIFIER,
DISPLAY,
SPEAKER,
WIFI,
CAMERA,
FLASHLIGHT,
USB_PORT,
}

View file

@ -35,7 +35,7 @@ package android.hardware.thermal;
/* @hide */
@Backing(type="int") @VintfStability
enum TemperatureType {
UNKNOWN = (-1),
UNKNOWN = (-1) /* -1 */,
CPU = 0,
GPU = 1,
BATTERY = 2,
@ -50,4 +50,10 @@ enum TemperatureType {
DISPLAY = 11,
MODEM = 12,
SOC = 13,
WIFI = 14,
CAMERA = 15,
FLASHLIGHT = 16,
SPEAKER = 17,
AMBIENT = 18,
POGO = 19,
}

View file

@ -34,4 +34,8 @@ enum CoolingType {
POWER_AMPLIFIER,
DISPLAY,
SPEAKER,
WIFI,
CAMERA,
FLASHLIGHT,
USB_PORT,
}

View file

@ -44,4 +44,10 @@ enum TemperatureType {
DISPLAY = 11,
MODEM = 12,
SOC = 13,
WIFI = 14,
CAMERA = 15,
FLASHLIGHT = 16,
SPEAKER = 17,
AMBIENT = 18,
POGO = 19,
}

View file

@ -27,7 +27,7 @@ cc_binary {
vendor: true,
stl: "c++_static",
static_libs: [
"android.hardware.thermal-V1-ndk",
"android.hardware.thermal-V2-ndk",
"libbase",
],
shared_libs: [

View file

@ -1,7 +1,7 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.thermal</name>
<version>1</version>
<version>2</version>
<fqname>IThermal/default</fqname>
</hal>
</manifest>

View file

@ -32,7 +32,7 @@ cc_test {
"libbinder_ndk",
],
static_libs: [
"android.hardware.thermal-V1-ndk",
"android.hardware.thermal-V2-ndk",
],
test_suites: [
"vts",