From 73cfd8f781ee4e5a2edb04a6e2a025dab592b00e Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Thu, 24 Feb 2022 14:39:11 +0900
Subject: [PATCH] universal7885: Don't add new member to struct

* Because 2 structs are different, causing issues

Change-Id: Iafacbea214611631447764cc27bc3b4e533b2a76
Signed-off-by: roynatech2544 <whiteshell2544@naver.com>
---
 universal7885-common/libshims/camera/CamDevice_3_2.h     | 1 -
 universal7885-common/libshims/camera/CorrectCameraID.cpp | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/universal7885-common/libshims/camera/CamDevice_3_2.h b/universal7885-common/libshims/camera/CamDevice_3_2.h
index dd62912..76818bf 100644
--- a/universal7885-common/libshims/camera/CamDevice_3_2.h
+++ b/universal7885-common/libshims/camera/CamDevice_3_2.h
@@ -97,7 +97,6 @@ protected:
 
     const sp<CameraModule> mModule;
     const std::string mCameraId;
-    std::string mCameraID;
     // const after ctor
     int   mCameraIdInt;
     int   mDeviceVersion;
diff --git a/universal7885-common/libshims/camera/CorrectCameraID.cpp b/universal7885-common/libshims/camera/CorrectCameraID.cpp
index cfda59f..db448e2 100644
--- a/universal7885-common/libshims/camera/CorrectCameraID.cpp
+++ b/universal7885-common/libshims/camera/CorrectCameraID.cpp
@@ -79,7 +79,7 @@ Return<void> CameraDevice::open(const sp<ICameraDeviceCallback>& callback,
         status_t res;
         camera3_device_t *device;
         
-        mCameraID = mCameraId;
+        std::string mCameraID = mCameraId;
 	if (mCameraIdInt == 1) mCameraIdInt = 2;
 	if (mCameraID == "1") mCameraID = "2";