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

Commit a3878c80 authored by Mina Granic's avatar Mina Granic Committed by Android (Google) Code Review
Browse files

Merge "Use DesktopWindowing flag for Camera Compat for Freeform." into main

parents b106bb92 d19814ae

services/camera/libcameraservice/common/Camera2ClientBase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ void Camera2ClientBase<TClientBase>::notifyPhysicalCameraChange(const std::strin 
        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)) {

services/camera/libcameraservice/common/CameraProviderManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2800,7 +2800,7 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::getCameraInfo( 
        hardware::CameraInfo *info) const {

    if (info == nullptr) return BAD_VALUE;



    bool freeform_compat_enabled = wm_flags::camera_compat_for_freeform();

    bool freeform_compat_enabled = wm_flags::enable_camera_compat_for_desktop_windowing();

    if (!freeform_compat_enabled &&

            rotationOverride > hardware::ICameraService::ROTATION_OVERRIDE_OVERRIDE_TO_PORTRAIT) {

        ALOGW("Camera compat freeform flag disabled but rotation override is %d", rotationOverride);