commit 811e540e46a5c8e42964654143ba47c72e26e72f
author Shuzhen Wang <shuzhenwang@google.com> Fri Dec 16 01:20:53 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 16 01:20:53 2022 +0000
tree 7867c75c1a704a341775da87413bb5c20bbef083
parent caa69cd0ae322903fb5a0b20102efb258e4557b4
parent 7e4fb4beed9c7eb6279542b98920ea50f91d11b1

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

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

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

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 68b3196..2a04658 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -342,8 +342,9 @@
         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;