Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add optional notifyThresholdChanged API" into main

Browse Source
This commit is contained in:
Xiang Wang
2024-10-23 00:59:03 +00:00
committed by Android (Google) Code Review
parent ae629e95c3 bd4ef07813
commit 4b047f84ac
8 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
compatibility_matrices/compatibility_matrix.202504.xml
View File

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

3
thermal/aidl/Android.bp
View File

@@ -48,8 +48,7 @@ aidl_interface {
version: "2",
imports: [],
},
],
frozen: true,
frozen: false,
}

1
thermal/aidl/aidl_api/android.hardware.thermal/current/android/hardware/thermal/IThermalChangedCallback.aidl
View File

@@ -36,4 +36,5 @@ package android.hardware.thermal;
@VintfStability
interface IThermalChangedCallback {
oneway void notifyThrottling(in android.hardware.thermal.Temperature temperature);
oneway void notifyThresholdChanged(in android.hardware.thermal.TemperatureThreshold threshold);
}

11
thermal/aidl/android/hardware/thermal/IThermalChangedCallback.aidl
View File

@@ -17,6 +17,7 @@
package android.hardware.thermal;
import android.hardware.thermal.Temperature;
import android.hardware.thermal.TemperatureThreshold;
/**
* IThermalChangedCallback send throttling notification to clients.
@@ -25,11 +26,19 @@ import android.hardware.thermal.Temperature;
@VintfStability
interface IThermalChangedCallback {
/**
* Send a thermal throttling event to all ThermalHAL
* Send a thermal throttling event to all Thermal HAL
* thermal event listeners.
*
* @param temperature The temperature associated with the
* throttling event.
*/
oneway void notifyThrottling(in Temperature temperature);
/**
* Send a thermal threshold change event to all Thermal HAL
* thermal event listeners.
*
* @param threshold The temperature threshold that changed.
*/
oneway void notifyThresholdChanged(in TemperatureThreshold threshold);
}

2
thermal/aidl/default/Android.bp
View File

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

2
thermal/aidl/default/thermal-example.xml
View File

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

2
thermal/aidl/vts/Android.bp
View File

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

4
thermal/aidl/vts/VtsHalThermalTargetTest.cpp
View File

@@ -93,6 +93,10 @@ class ThermalCallback : public BnThermalChangedCallback {
return ndk::ScopedAStatus::ok();
}
ndk::ScopedAStatus notifyThresholdChanged(const TemperatureThreshold&) {
return ndk::ScopedAStatus::ok();
}
template <typename R, typename P>
[[nodiscard]] bool waitForCallback(std::chrono::duration<R, P> duration) {
std::unique_lock<std::mutex> lock(mMutex);