commit 925abedb3a2517879c79532ed347e7b113719171
author Austin Borger <borgera@google.com> Mon Jan 09 12:29:10 2023 -0800
committer Austin Borger <borgera@google.com> Wed Jan 11 11:43:31 2023 -0800
tree 96b4def337e255f7a0e4e74c2055e07124d7133f
parent abe5ea1b0bdca448713ecd0fb06e3a64d81822ea

CameraService: Disable overrideToPortrait for dumpsys media.camera.

Also upgrade logging for the sensor orientation override to info,
and add a log for when the device orientation map is erased. This
is required for debugging purposes.

Bug: 264647891
Test: Ran adb shell dumpsys media.camera.
Change-Id: Iccd937f61173be310b85e36e88be1b3ce984e4a0

services/camera/libcameraservice/common/CameraProviderManager.cpp

diff --git a/services/camera/libcameraservice/common/CameraProviderManager.cpp b/services/camera/libcameraservice/common/CameraProviderManager.cpp
index 3132787..788064e 100644
--- a/services/camera/libcameraservice/common/CameraProviderManager.cpp
+++ b/services/camera/libcameraservice/common/CameraProviderManager.cpp
@@ -2029,7 +2029,7 @@
         }
         CameraMetadata info2;
         res = device->getCameraCharacteristics(true /*overrideForPerfClass*/, &info2,
-                /*overrideToPortrait*/true);
+                /*overrideToPortrait*/false);
         if (res == INVALID_OPERATION) {
             dprintf(fd, "  API2 not directly supported\n");
         } else if (res != OK) {
@@ -2380,8 +2380,8 @@
     if (overrideToPortrait) {
         const auto &lensFacingEntry = characteristics->find(ANDROID_LENS_FACING);
         const auto &sensorOrientationEntry = characteristics->find(ANDROID_SENSOR_ORIENTATION);
+        uint8_t lensFacing = lensFacingEntry.data.u8[0];
         if (lensFacingEntry.count > 0 && sensorOrientationEntry.count > 0) {
-            uint8_t lensFacing = lensFacingEntry.data.u8[0];
             int32_t sensorOrientation = sensorOrientationEntry.data.i32[0];
             int32_t newSensorOrientation = sensorOrientation;
 
@@ -2402,6 +2402,8 @@
         }
 
         if (characteristics->exists(ANDROID_INFO_DEVICE_STATE_ORIENTATIONS)) {
+            ALOGV("%s: Erasing ANDROID_INFO_DEVICE_STATE_ORIENTATIONS for lens facing %d",
+                    __FUNCTION__, lensFacing);
             characteristics->erase(ANDROID_INFO_DEVICE_STATE_ORIENTATIONS);
         }
     }