From d3df4f387f94575a0502984a53a81d4b951f4e63 Mon Sep 17 00:00:00 2001 From: DennySPb Date: Wed, 16 Sep 2020 11:41:53 +0300 Subject: [PATCH] CameraDeviceClient: make mPrivilegedClient static Signed-off-by: DennySPb Signed-off-by: Anushek Prasal Change-Id: Ibecf567a5b385b2c32ddfb08be4748cbb4420aaa (cherry picked from commit 7586ba018fdfbe598b54a905add0575676d6885b) --- services/camera/libcameraservice/api2/CameraDeviceClient.cpp | 5 ++--- services/camera/libcameraservice/api2/CameraDeviceClient.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp index cfda3959067..8cb71304332 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp @@ -91,9 +91,8 @@ CameraDeviceClient::CameraDeviceClient(const sp& cameraService, cameraFacing, clientPid, clientUid, servicePid), mInputStream(), mStreamingRequestId(REQUEST_ID_NONE), - mRequestIdCounter(0), - mPrivilegedClient(false) { - + mRequestIdCounter(0) { + mPrivilegedClient = false; char value[PROPERTY_VALUE_MAX]; property_get("persist.vendor.camera.privapp.list", value, ""); String16 packagelist(value); diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.h b/services/camera/libcameraservice/api2/CameraDeviceClient.h index d03b0306cb4..378099f16d3 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.h +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.h @@ -335,7 +335,7 @@ class CameraDeviceClient : static const int32_t REQUEST_ID_NONE = -1; int32_t mRequestIdCounter; - bool mPrivilegedClient; + static inline bool mPrivilegedClient; // The list of output streams whose surfaces are deferred. We have to track them separately // as there are no surfaces available and can not be put into mStreamMap. Once the deferred