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

Commit cb0d2eb3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "[Composer AIDL] Rename notifyExpectedPresentTimeoutNs and"" into main

parents def55fc1 82426a4a

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/VrrConfig.aidl

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ parcelable VrrConfig { 
    int averageRefreshPeriodNs;

  }

  parcelable NotifyExpectedPresentConfig {

    int headsUpNs;

    int timeoutNs;

    int notifyExpectedPresentHeadsUpNs;

    int notifyExpectedPresentTimeoutNs;

  }

}

graphics/composer/aidl/android/hardware/graphics/composer3/IComposerClient.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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

graphics/composer/aidl/android/hardware/graphics/composer3/VrrConfig.aidl

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }



    /**

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);

                }

            }

        }