From 82426a4a40b83ad55fbce46142c90c336213bded Mon Sep 17 00:00:00 2001
From: Ram Indani <ramindani@google.com>
Date: Fri, 1 Sep 2023 20:02:50 +0000
Subject: [PATCH] Revert "[Composer AIDL] Rename notifyExpectedPresentTimeoutNs
 and"

This reverts commit f850701be095f780d9f987c8a9e125425f5b5797.

Reason for revert: Delaying rename to avoid churn for external partner work.

Change-Id: If96786d074a61ac0f781540e98d020a6f7fd673b
---
 .../android/hardware/graphics/composer3/VrrConfig.aidl        | 4 ++--
 .../android/hardware/graphics/composer3/IComposerClient.aidl  | 4 ++--
 .../aidl/android/hardware/graphics/composer3/VrrConfig.aidl   | 4 ++--
 .../composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/VrrConfig.aidl b/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/VrrConfig.aidl
index 7377b4b3e5..bb2569f342 100644
--- a/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/VrrConfig.aidl
+++ b/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/VrrConfig.aidl
@@ -42,7 +42,7 @@ parcelable VrrConfig {
     int averageRefreshPeriodNs;
   }
   parcelable NotifyExpectedPresentConfig {
-    int headsUpNs;
-    int timeoutNs;
+    int notifyExpectedPresentHeadsUpNs;
+    int notifyExpectedPresentTimeoutNs;
   }
 }
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/IComposerClient.aidl b/graphics/composer/aidl/android/hardware/graphics/composer3/IComposerClient.aidl
index ec54f2ab81..725c9475c9 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/IComposerClient.aidl
+++ b/graphics/composer/aidl/android/hardware/graphics/composer3/IComposerClient.aidl
@@ -895,9 +895,9 @@ interface IComposerClient {
      *
      * The framework will call this function based on the parameters specified in
      * DisplayConfiguration.VrrConfig:
-     * - timeoutNs specifies the idle time from the previous present command
+     * - notifyExpectedPresentTimeoutNs specifies the idle time from the previous present command
      * where the framework must send the early hint for the next frame.
-     * - headsUpNs specifies minimal time that framework must send
+     * - notifyExpectedPresentHeadsUpNs specifies minimal time that framework must send
      * the early hint before the next frame.
      *
      * The framework can omit calling this API when the next present command matches
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/VrrConfig.aidl b/graphics/composer/aidl/android/hardware/graphics/composer3/VrrConfig.aidl
index 93667e0a56..3b241ba0c9 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/VrrConfig.aidl
+++ b/graphics/composer/aidl/android/hardware/graphics/composer3/VrrConfig.aidl
@@ -45,7 +45,7 @@ parcelable VrrConfig {
          * The minimal time in nanoseconds that IComposerClient.notifyExpectedPresent needs to be
          * called ahead of an expectedPresentTime provided on a presentDisplay command.
          */
-        int headsUpNs;
+        int notifyExpectedPresentHeadsUpNs;
 
         /**
          * The time in nanoseconds that represents a timeout from the previous presentDisplay, which
@@ -53,7 +53,7 @@ parcelable VrrConfig {
          * sending the next frame. If set to 0, there is no need to call
          * IComposerClient.notifyExpectedPresent for timeout.
          */
-        int timeoutNs;
+        int notifyExpectedPresentTimeoutNs;
     }
 
     /**
diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
index 4a8e3b422f..1e6f34b534 100644
--- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
+++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
@@ -1274,8 +1274,8 @@ TEST_P(GraphicsComposerAidlV3Test, GetDisplayConfigurations) {
                 if (vrrConfig.notifyExpectedPresentConfig) {
                     const auto& notifyExpectedPresentConfig =
                             *vrrConfig.notifyExpectedPresentConfig;
-                    EXPECT_GT(0, notifyExpectedPresentConfig.headsUpNs);
-                    EXPECT_GE(0, notifyExpectedPresentConfig.timeoutNs);
+                    EXPECT_GT(0, notifyExpectedPresentConfig.notifyExpectedPresentHeadsUpNs);
+                    EXPECT_GE(0, notifyExpectedPresentConfig.notifyExpectedPresentTimeoutNs);
                 }
             }
         }