From ea37fc1880d7f692f46f75299cd3393e40c3dde6 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Mon, 20 Nov 2023 12:47:11 +0000 Subject: [PATCH] Revert "Add GPU enabled ADPF to V5 of power hal." Revert submission 24997733-adpf-gpu-plumbing Reason for revert: b/311102554 Reverted changes: /q/submissionid:24997733-adpf-gpu-plumbing Change-Id: Ifd5a0bedbbffb827d81584f418a2e7fd1d5b787f --- .../android/hardware/power/WorkDuration.aidl | 3 --- .../android/hardware/power/WorkDuration.aidl | 24 +------------------ 2 files changed, 1 insertion(+), 26 deletions(-) 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 45013ddf77..e86cd40ec2 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 @@ package android.hardware.power; 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 fcd638b77a..a06a058fb5 100644 --- a/power/aidl/android/hardware/power/WorkDuration.aidl +++ b/power/aidl/android/hardware/power/WorkDuration.aidl @@ -23,30 +23,8 @@ parcelable WorkDuration { * 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; }