commit 45ec7c2e4c749bbd5933f1a5e855f7513a975332
author Austin Borger <borgera@google.com> Wed Jan 25 10:59:08 2023 -0800
committer Austin Borger <borgera@google.com> Wed Feb 01 19:14:04 2023 +0000
tree f4d9e48fe826274fb5903e84e274944cf55b27b4
parent f8a8526d70d892b9f31614222858cff3c73d4b47

Camera NDK: Do not enable overrideToPortrait in ACameraManager

Enabling this will turn it on for all devices with landscape sensors,
which may not be what we want. There is no direct way to read app manifest
properties in native code.

Test: Ran Native CTS Camera tests, ARCore samples
Bug: 267498585
Change-Id: I00e867e186bb2427ce62a54e69cc30e11c6f7357

camera/ndk/impl/ACameraManager.cpp

diff --git a/camera/ndk/impl/ACameraManager.cpp b/camera/ndk/impl/ACameraManager.cpp
index 23d90cc..02047ae 100644
--- a/camera/ndk/impl/ACameraManager.cpp
+++ b/camera/ndk/impl/ACameraManager.cpp
@@ -696,7 +696,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:
@@ -748,7 +748,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());