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

Commit 2c4f0b64 authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

CameraService: Disable overrideToPortrait for dumpsys media.camera. am: 925abedb 

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



Change-Id: Ic6ee3afd132faf1f4cb8e501237f9081bd2e07a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43b76deb 925abedb

services/camera/libcameraservice/common/CameraProviderManager.cpp

+4 −2
Original line number Diff line number Diff line
@@ -2033,7 +2033,7 @@ status_t CameraProviderManager::ProviderInfo::dump(int fd, const Vector<String16 
        }

        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) {
@@ -2384,8 +2384,8 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::getCameraCharacterist 
    if (overrideToPortrait) {

        const auto &lensFacingEntry = characteristics->find(ANDROID_LENS_FACING);

        const auto &sensorOrientationEntry = characteristics->find(ANDROID_SENSOR_ORIENTATION);

        if (lensFacingEntry.count > 0 && sensorOrientationEntry.count > 0) {

        uint8_t lensFacing = lensFacingEntry.data.u8[0];

        if (lensFacingEntry.count > 0 && sensorOrientationEntry.count > 0) {

            int32_t sensorOrientation = sensorOrientationEntry.data.i32[0];

            int32_t newSensorOrientation = sensorOrientation;
@@ -2406,6 +2406,8 @@ status_t CameraProviderManager::ProviderInfo::DeviceInfo3::getCameraCharacterist 
        }



        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);

        }

    }