commit dd3d0fc7958463f9221757bf19a16b623f604570
author Austin Borger <borgera@google.com> Wed Feb 01 21:29:24 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 01 21:29:24 2023 +0000
tree 6d34fbe903fa5453d8bc2ed713fde9b105e53247
parent 358615af44afe1e444b72cf0bca383ad6ad51979
parent a3cab960a7d8e5d3f233ebccef6ab28437b810ae

Merge "Camera NDK: Do not enable overrideToPortrait in ACameraManager" into tm-qpr-dev am: ab02c1a03f am: a3cab960a7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/21098014

Change-Id: Ie4dffb9e71f023ed45d84d4e34400c36fdd8b40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

camera/ndk/impl/ACameraManager.cpp

diff --git a/camera/ndk/impl/ACameraManager.cpp b/camera/ndk/impl/ACameraManager.cpp
index 9dc262f..837b5be 100644
--- a/camera/ndk/impl/ACameraManager.cpp
+++ b/camera/ndk/impl/ACameraManager.cpp
@@ -695,7 +695,7 @@
     CameraMetadata rawMetadata;
     int targetSdkVersion = android_get_application_target_sdk_version();
     binder::Status serviceRet = cs->getCameraCharacteristics(String16(cameraIdStr),
-            targetSdkVersion, /*overrideToPortrait*/true, &rawMetadata);
+            targetSdkVersion, /*overrideToPortrait*/false, &rawMetadata);
     if (!serviceRet.isOk()) {
         switch(serviceRet.serviceSpecificErrorCode()) {
             case hardware::ICameraService::ERROR_DISCONNECTED:
@@ -747,7 +747,7 @@
     binder::Status serviceRet = cs->connectDevice(
             callbacks, String16(cameraId), String16(""), {},
             hardware::ICameraService::USE_CALLING_UID, /*oomScoreOffset*/0,
-            targetSdkVersion, /*overrideToPortrait*/true, /*out*/&deviceRemote);
+            targetSdkVersion, /*overrideToPortrait*/false, /*out*/&deviceRemote);
 
     if (!serviceRet.isOk()) {
         ALOGE("%s: connect camera device failed: %s", __FUNCTION__, serviceRet.toString8().string());