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

Commit f5d717f2 authored by Matt Buckley's avatar Matt Buckley Committed by Android (Google) Code Review
Browse files

Merge "Add timestamps to FMQ ChannelMessage" into main

parents 4ae018c9 1c1fc91e
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -35,10 +35,11 @@ package android.hardware.power;
@FixedSize @VintfStability
parcelable ChannelMessage {
  int sessionID;
  long timeStampNanos;
  android.hardware.power.ChannelMessage.ChannelMessageContents data;
  @FixedSize @VintfStability
  union ChannelMessageContents {
    int[20] tids = {(-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */, (-1) /* -1 */};
    long[16] reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
    long targetDuration;
    android.hardware.power.SessionHint hint;
    android.hardware.power.ChannelMessage.ChannelMessageContents.SessionModeSetter mode;
+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@
package android.hardware.power;
@FixedSize @VintfStability
parcelable WorkDurationFixedV1 {
  long timeStampNanos;
  long durationNanos;
  long workPeriodStartTimestampNanos;
  long cpuDurationNanos;
+8 −5
Original line number Diff line number Diff line
@@ -37,6 +37,12 @@ parcelable ChannelMessage {
     */
    int sessionID;

    /**
     * Timestamp in nanoseconds based on CLOCK_MONOTONIC when the message was sent,
     * used to ensure all messages can be processed in a coherent order.
     */
    long timeStampNanos;

    /**
     * A union defining the different messages that can be passed through the
     * channel. Each type corresponds to a different call in IPowerHintSession.
@@ -47,12 +53,9 @@ parcelable ChannelMessage {
    @VintfStability
    union ChannelMessageContents {
        /**
         * List of TIDs for this session to change to. Can be used in cases
         * where HintManagerService is not needed to validate the TIDs, such as
         * when all TIDs directly belong to the process that owns the session.
         * Reserves the maximum fixed size for the ChannelMessage.
         */
        int[20] tids = {
                -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1};
        long[16] reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};

        /**
         * Setting this field will update the session’s target duration, equivalent
+0 −6
Original line number Diff line number Diff line
@@ -19,12 +19,6 @@ package android.hardware.power;
@FixedSize
@VintfStability
parcelable WorkDurationFixedV1 {
    /**
     * Timestamp in nanoseconds based on CLOCK_MONOTONIC when the duration
     * sample was measured.
     */
    long timeStampNanos;

    /**
     * Total work duration in nanoseconds.
     */