commit 7b14d5e6c4387c5d4ec5cf61be57ba4bf61d29af
author Austin Borger <borgera@google.com> Thu Mar 16 10:29:20 2023 -0700
committer Austin Borger <borgera@google.com> Fri Mar 17 22:07:05 2023 +0000
tree 8e7f18756c20231f63272b56bc490fbbb4446110
parent 2490b2d2a7615842099350b0cbbc63fffe30d976

Turn off overrideToPortrait where not needed.

HIDL devices will not have rotate and crop, so this should be completely
turned off for them. Some other calls to getCameraCharacteristics are in
passing and overrideToPortrait has no impact for them, but turn it off
just in case.

Bug: 273638116
Test: Tested foldable device with/without override.
Change-Id: Id56a1ed0327e343f7f0e0bf161231f302badd12b

services/camera/libcameraservice/hidl/HidlCameraService.cpp

diff --git a/services/camera/libcameraservice/hidl/HidlCameraService.cpp b/services/camera/libcameraservice/hidl/HidlCameraService.cpp
index 259e8a5..fc063ab 100644
--- a/services/camera/libcameraservice/hidl/HidlCameraService.cpp
+++ b/services/camera/libcameraservice/hidl/HidlCameraService.cpp
@@ -65,7 +65,7 @@
     HStatus status = HStatus::NO_ERROR;
     binder::Status serviceRet =
         mAidlICameraService->getCameraCharacteristics(String16(cameraId.c_str()),
-                /*targetSdkVersion*/__ANDROID_API_FUTURE__, /*overrideToPortrait*/true,
+                /*targetSdkVersion*/__ANDROID_API_FUTURE__, /*overrideToPortrait*/false,
                 &cameraMetadata);
     HCameraMetadata hidlMetadata;
     if (!serviceRet.isOk()) {
@@ -117,7 +117,7 @@
     binder::Status serviceRet = mAidlICameraService->connectDevice(
             callbacks, String16(cameraId.c_str()), String16(""), {},
             hardware::ICameraService::USE_CALLING_UID, 0/*oomScoreOffset*/,
-            /*targetSdkVersion*/__ANDROID_API_FUTURE__, /*overrideToPortrait*/true,
+            /*targetSdkVersion*/__ANDROID_API_FUTURE__, /*overrideToPortrait*/false,
             /*out*/&deviceRemote);
     HStatus status = HStatus::NO_ERROR;
     if (!serviceRet.isOk()) {