commit f221e8dd72c325f15437ed4ba32916393e587461
author Shuzhen Wang <shuzhenwang@google.com> Thu Dec 15 13:26:29 2022 -0800
committer Shuzhen Wang <shuzhenwang@google.com> Thu Dec 15 13:27:50 2022 -0800
tree 4a7867e564bfca9f51f89f437b1375dd28879c73
parent 6aea1603bbfa2b7223271836eef44d12e3114e49

Camera: Fix parameter misalignment in getDeviceVersion

Test: atest CtsCameraApi31TestCases
Bug: 262690095
Change-Id: I0fa83f2d309eb7675d0eac4436acf64f688b18a9

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index 53b0b49..3f8a031 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;