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

Commit 54e69772 authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Automerger Merge Worker
Browse files

Merge "Camera: Fix parameter misalignment in getDeviceVersion" into tm-qpr-dev... 

Merge "Camera: Fix parameter misalignment in getDeviceVersion" into tm-qpr-dev am: 7e4fb4be am: 811e540e

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



Change-Id: I568634b25a917c0f7b9e3d96cf6a4b74676a6120
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0751c07 811e540e

services/camera/libcameraservice/CameraService.cpp

+3 −2
Original line number Diff line number Diff line
@@ -348,8 +348,9 @@ void CameraService::filterSPerfClassCharacteristicsLocked() { 
        int facing = -1;

        int orientation = 0;

        String8 cameraId8(cameraId.c_str());

        getDeviceVersion(cameraId8, /*overrideToPortrait*/false, /*out*/&facing,

                /*out*/&orientation);

        int portraitRotation;

        getDeviceVersion(cameraId8, /*overrideToPortrait*/false, /*out*/&portraitRotation,

                /*out*/&facing, /*out*/&orientation);

        if (facing == -1) {

            ALOGE("%s: Unable to get camera device \"%s\" facing", __FUNCTION__, cameraId.c_str());

            return;