commit 288c434f34e88881793cff10f9c1c9272e0ef246
author Steven Thomas <steventhomas@google.com> Thu Apr 09 01:08:40 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 09 01:08:40 2020 +0000
tree 4f6f8c1328d6d3c8ab7ec46ebe570f9d90a71dac
parent a23f461e1b75c50692c41e5eb4cb41e1922c9608
parent 6faeaa2a9b4182a466522fe118860329d9f4c3a7

Merge "Add acquireFrameRateFlexibilityToken permission comment" into rvc-dev

core/java/android/view/SurfaceControl.java

diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java
index ab65e3a..1086774 100644
--- a/core/java/android/view/SurfaceControl.java
+++ b/core/java/android/view/SurfaceControl.java
@@ -2888,7 +2888,8 @@
     /**
      * Acquire a frame rate flexibility token, which allows surface flinger to freely switch display
      * frame rates. This is used by CTS tests to put the device in a consistent state. See
-     * ISurfaceComposer::acquireFrameRateFlexibilityToken().
+     * ISurfaceComposer::acquireFrameRateFlexibilityToken(). The caller must have the
+     * ACCESS_SURFACE_FLINGER permission, or else the call will fail, returning 0.
      * @hide
      */
     @TestApi