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

Commit 4b047f84 authored by Xiang Wang's avatar Xiang Wang Committed by Android (Google) Code Review
Browse files

Merge "Add optional notifyThresholdChanged API" into main

parents ae629e95 bd4ef078

compatibility_matrices/compatibility_matrix.202504.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

thermal/aidl/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ aidl_interface { 
            version: "2",

            imports: [],

        },



    ],

    frozen: true,

    frozen: false,



}

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

+1 −0
Original line number Diff line number Diff line
@@ -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);

}

thermal/aidl/android/hardware/thermal/IThermalChangedCallback.aidl

+10 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.hardware.thermal;



import android.hardware.thermal.Temperature;

import android.hardware.thermal.TemperatureThreshold;



/**

 * IThermalChangedCallback send throttling notification to clients.
@@ -32,4 +33,12 @@ interface IThermalChangedCallback { 
     *    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);

}

thermal/aidl/default/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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: [