commit 3836d4c36d1b8c5a04acd7dfc0536bcd56f88ee2
author Rob Carr <racarr@google.com> Mon Apr 09 19:19:51 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 09 19:19:51 2018 +0000
tree 24f014c34a774bc5e28b3fce6707386bf5adcfde
parent 7c9764f39fbe1bbd9e9556c9294e490eb37635fc
parent 175ed5bade222558de483a7b875e9ab42576fda2

Merge "ANativeWindow_setBuffersTransform: Allow forwarding INVERSE_DISPLAY" into pi-dev

libs/nativewindow/ANativeWindow.cpp

diff --git a/libs/nativewindow/ANativeWindow.cpp b/libs/nativewindow/ANativeWindow.cpp
index 2598451..765dcd9 100644
--- a/libs/nativewindow/ANativeWindow.cpp
+++ b/libs/nativewindow/ANativeWindow.cpp
@@ -113,7 +113,10 @@
     constexpr int32_t kAllTransformBits =
             ANATIVEWINDOW_TRANSFORM_MIRROR_HORIZONTAL |
             ANATIVEWINDOW_TRANSFORM_MIRROR_VERTICAL |
-            ANATIVEWINDOW_TRANSFORM_ROTATE_90;
+            ANATIVEWINDOW_TRANSFORM_ROTATE_90 |
+            // We don't expose INVERSE_DISPLAY as an NDK constant, but someone could have read it
+            // from a buffer already set by Camera framework, so we allow it to be forwarded.
+            NATIVE_WINDOW_TRANSFORM_INVERSE_DISPLAY;
     if (!window || !query(window, NATIVE_WINDOW_IS_VALID))
         return -EINVAL;
     if ((transform & ~kAllTransformBits) != 0)