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

Commit fc1aa59d authored by Maggie White's avatar Maggie White
Browse files

statsd implementation of USB port overheat event reporting 



Bug: 119200347
Test: su 0 ./stats_client -u
Test: Observed USB port overheat event in statsd logs
Change-Id: Ic8801417c54c118e10bb9b631d8e77d68a65c799
Signed-off-by: default avatarMaggie White <maggiewhite@google.com>
parent 235ab333

cmds/statsd/src/StatsService.cpp

+8 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,14 @@ hardware::Return<void> StatsService::reportBatteryCausedShutdown( 
    return hardware::Void();

}



hardware::Return<void> StatsService::reportUsbPortOverheatEvent(

        const UsbPortOverheatEvent& usbPortOverheatEvent) {

    LogEvent event(getWallClockSec() * NS_PER_SEC, getElapsedRealtimeNs(), usbPortOverheatEvent);

    mProcessor->OnLogEvent(&event);



    return hardware::Void();

}



void StatsService::binderDied(const wp <IBinder>& who) {

    ALOGW("statscompanion service died");

    StatsdStats::getInstance().noteSystemServerRestart(getWallClockSec());

cmds/statsd/src/StatsService.h

+6 −0
Original line number Diff line number Diff line
@@ -199,6 +199,12 @@ public: 
    virtual Return<void> reportBatteryCausedShutdown(

            const BatteryCausedShutdown& batteryCausedShutdown) override;



    /**

     * Binder call to get UsbPortOverheatEvent atom.

     */

    virtual Return<void> reportUsbPortOverheatEvent(

            const UsbPortOverheatEvent& usbPortOverheatEvent) override;



    /** IBinder::DeathRecipient */

    virtual void binderDied(const wp<IBinder>& who) override;

cmds/statsd/src/atoms.proto

+19 −0
Original line number Diff line number Diff line
@@ -193,6 +193,7 @@ message Atom { 
        LowStorageStateChanged low_storage_state_changed = 130;

        GnssNfwNotificationReported gnss_nfw_notification_reported = 131;

        GnssConfigurationReported gnss_configuration_reported = 132;

        UsbPortOverheatEvent usb_port_overheat_event_reported = 133;

    }



    // Pulled events will start at field 10000.
@@ -2468,6 +2469,24 @@ message BinaryPushStateChanged { 
    optional State state = 3;

}



/** Represents USB port overheat event. */

message UsbPortOverheatEvent {

    /* Temperature of USB port at USB plug event, in 1/10ths of degree C. */

    optional int32 plug_temperature_deci_c = 1;



    /* Maximum temperature of USB port during overheat event, in 1/10ths of degree C. */

    optional int32 max_temperature_deci_c = 2;



    /* Time between USB plug event and overheat threshold trip, in seconds. */

    optional int32 time_to_overheat_secs = 3;



    /* Time between overheat threshold trip and hysteresis, in seconds. */

    optional int32 time_to_hysteresis_secs = 4;



    /* Time between hysteresis and active mitigation ending, in seconds. */

    optional int32 time_to_inactive_secs = 5;

};



/*

 * Logs when a connection becomes available and lost.

 * Logged in StatsCompanionService.java

cmds/statsd/src/logd/LogEvent.cpp

+18 −0
Original line number Diff line number Diff line
@@ -276,6 +276,24 @@ LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs, 
                                 Value(batteryCausedShutdown.voltageMicroV)));

}



LogEvent::LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs,

                   const UsbPortOverheatEvent& usbPortOverheatEvent) {

    mLogdTimestampNs = wallClockTimestampNs;

    mElapsedTimestampNs = elapsedTimestampNs;

    mTagId = android::util::USB_PORT_OVERHEAT_EVENT_REPORTED;



    mValues.push_back(FieldValue(Field(mTagId, getSimpleField(1)),

                                 Value(usbPortOverheatEvent.plugTemperatureDeciC)));

    mValues.push_back(FieldValue(Field(mTagId, getSimpleField(2)),

                                 Value(usbPortOverheatEvent.maxTemperatureDeciC)));

    mValues.push_back(FieldValue(Field(mTagId, getSimpleField(3)),

                                 Value(usbPortOverheatEvent.timeToOverheat)));

    mValues.push_back(FieldValue(Field(mTagId, getSimpleField(4)),

                                 Value(usbPortOverheatEvent.timeToHysteresis)));

    mValues.push_back(FieldValue(Field(mTagId, getSimpleField(5)),

                                 Value(usbPortOverheatEvent.timeToInactive)));

}



LogEvent::LogEvent(int32_t tagId, int64_t timestampNs) : LogEvent(tagId, timestampNs, 0) {}



LogEvent::LogEvent(int32_t tagId, int64_t timestampNs, int32_t uid) {

cmds/statsd/src/logd/LogEvent.h

+3 −0
Original line number Diff line number Diff line
@@ -118,6 +118,9 @@ public: 
    explicit LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs,

                      const BatteryCausedShutdown& batteryCausedShutdown);



    explicit LogEvent(int64_t wallClockTimestampNs, int64_t elapsedTimestampNs,

                      const UsbPortOverheatEvent& usbPortOverheatEvent);



    ~LogEvent();



    /**