Merge "Revert "Add GPU enabled ADPF to V5 of power hal."" into main
diff --git a/power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/WorkDuration.aidl b/power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/WorkDuration.aidl
index 45013dd..e86cd40 100644
--- a/power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/WorkDuration.aidl
+++ b/power/aidl/aidl_api/android.hardware.power/current/android/hardware/power/WorkDuration.aidl
@@ -36,7 +36,4 @@
parcelable WorkDuration {
long timeStampNanos;
long durationNanos;
- long workPeriodStartTimestampNanos;
- long cpuDurationNanos;
- long gpuDurationNanos;
}
diff --git a/power/aidl/android/hardware/power/WorkDuration.aidl b/power/aidl/android/hardware/power/WorkDuration.aidl
index fcd638b..a06a058 100644
--- a/power/aidl/android/hardware/power/WorkDuration.aidl
+++ b/power/aidl/android/hardware/power/WorkDuration.aidl
@@ -23,30 +23,8 @@
* sample was measured.
*/
long timeStampNanos;
-
/**
- * Total work duration in nanoseconds.
+ * Work duration in nanoseconds.
*/
long durationNanos;
-
- /**
- * Timestamp in nanoseconds based on CLOCK_MONOTONIC when the work starts.
- * The work period start timestamp could be zero if the call is from
- * the legacy SDK/NDK reportActualWorkDuration API.
- */
- long workPeriodStartTimestampNanos;
-
- /**
- * CPU work duration in nanoseconds.
- * The CPU work duration could be the same as the total work duration if
- * the call is from the legacy SDK/NDK reportActualWorkDuration API.
- */
- long cpuDurationNanos;
-
- /**
- * GPU work duration in nanoseconds.
- * The GPU work duration could be zero if the call is from the legacy
- * SDK/NDK reportActualWorkDuration API.
- */
- long gpuDurationNanos;
}