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

Commit 7e4fb4be authored by Shuzhen Wang's avatar Shuzhen Wang Committed by Android (Google) Code Review
Browse files

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

parents 41ccf7f5 f221e8dd

services/camera/libcameraservice/CameraService.cpp

+3 −2
Original line number Diff line number Diff line
@@ -342,8 +342,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;