commit d19814ae608b3720fd4b6e3b3cb3e99a83c62ceb
author Mina Granic <minagranic@google.com> Tue Jun 18 10:08:58 2024 +0000
committer Mina Granic <minagranic@google.com> Thu Sep 26 14:36:23 2024 +0000
tree 436745d39e1c451ebc6fa4f610673474903b5c29
parent ddaf1f9b1d5d940b7d7880c28729763f143af88c

Use DesktopWindowing flag for Camera Compat for Freeform.

Flag: com.android.window.flags.enable_camera_compat_for_desktop_windowing
Fixes: 344567658
Test: Desktop mode on large screen device
Change-Id: Idbbc039bd20db782b7006cfbdfc105b00bf727ee

services/camera/libcameraservice/common/Camera2ClientBase.cpp

diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.cpp b/services/camera/libcameraservice/common/Camera2ClientBase.cpp
index 352c6f8..18069fe 100644
--- a/services/camera/libcameraservice/common/Camera2ClientBase.cpp
+++ b/services/camera/libcameraservice/common/Camera2ClientBase.cpp
@@ -358,7 +358,7 @@
         bool landscapeSensor =  (orientation == 0 || orientation == 180);
         if (((TClientBase::mRotationOverride ==
                 ICameraService::ROTATION_OVERRIDE_OVERRIDE_TO_PORTRAIT) && landscapeSensor) ||
-                        ((wm_flags::camera_compat_for_freeform() &&
+                        ((wm_flags::enable_camera_compat_for_desktop_windowing() &&
                                 TClientBase::mRotationOverride ==
                                 ICameraService::ROTATION_OVERRIDE_ROTATION_ONLY)
                                 && !landscapeSensor)) {