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

Commit 1f11805d authored by Wei Wang's avatar Wei Wang Committed by Android (Google) Code Review
Browse files

Merge "Add NPU type sensor type"

parents 404e4309 be9759eb

thermal/2.0/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ hidl_interface { 
        "TemperatureThreshold",

        "TemperatureType",

        "ThrottlingSeverity",

        "ThrottlingSeverityCount",

    ],

    gen_java: true,

}

thermal/2.0/types.hal

+7 −7
Original line number Diff line number Diff line
@@ -22,12 +22,14 @@ import android.hardware.thermal@1.0::types; 
enum TemperatureType : @1.0::TemperatureType {

    USB_PORT = 4,

    POWER_AMPLIFIER = 5,

    /**

     * Battery Charge Limit - virtual thermal sensors

     */



    /** Battery Charge Limit - virtual thermal sensors */

    BCL_VOLTAGE = 6,

    BCL_CURRENT = 7,

    BCL_PERCENTAGE = 8,



    /**  Neural Processing Unit */

    NPU = 9,

};
@@ -82,8 +84,6 @@ enum ThrottlingSeverity : uint32_t { 
    SHUTDOWN,

};



enum ThrottlingSeverityCount : uint32_t {NUM_THROTTLING_LEVELS = 7};



struct TemperatureThreshold {

    /**

     * This temperature's type.
@@ -103,7 +103,7 @@ struct TemperatureThreshold { 
     * happens when temperature >= threshold. If not available, set to NAN.

     * Unit is same as Temperature's value.

     */

    float[ThrottlingSeverityCount:NUM_THROTTLING_LEVELS] hotThrottlingThresholds;

    float[ThrottlingSeverity#len] hotThrottlingThresholds;



    /**

     * Cold throttling temperature constant for this temperature sensor in
@@ -111,7 +111,7 @@ struct TemperatureThreshold { 
     * happens when temperature <= threshold. If not available, set to NAN.

     * Unit is same as Temperature's value.

     */

    float[ThrottlingSeverityCount:NUM_THROTTLING_LEVELS] coldThrottlingThresholds;

    float[ThrottlingSeverity#len] coldThrottlingThresholds;



    /**

     * Threshold temperature above which the VR mode clockrate minimums cannot

thermal/2.0/vts/functional/VtsHalThermalV2_0TargetTest.cpp

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ using ::android::hardware::thermal::V2_0::Temperature; 
using ::android::hardware::thermal::V2_0::TemperatureThreshold;

using ::android::hardware::thermal::V2_0::TemperatureType;

using ::android::hardware::thermal::V2_0::ThrottlingSeverity;

using ::android::hardware::thermal::V2_0::ThrottlingSeverityCount;



constexpr char kCallbackNameNotifyThrottling[] = "notifyThrottling";

static const Temperature kThrottleTemp = {