diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 850b275ea9..6e5c979757 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -2853,10 +2852,9 @@ void CameraService::SensorPrivacyPolicy::registerSelf() { if (mRegistered) { return; } - SensorPrivacyManager spm; - spm.addSensorPrivacyListener(this); - mSensorPrivacyEnabled = spm.isSensorPrivacyEnabled(); - status_t res = spm.linkToDeath(this); + mSpm.addSensorPrivacyListener(this); + mSensorPrivacyEnabled = mSpm.isSensorPrivacyEnabled(); + status_t res = mSpm.linkToDeath(this); if (res == OK) { mRegistered = true; ALOGV("SensorPrivacyPolicy: Registered with SensorPrivacyManager"); @@ -2865,9 +2863,8 @@ void CameraService::SensorPrivacyPolicy::registerSelf() { void CameraService::SensorPrivacyPolicy::unregisterSelf() { Mutex::Autolock _l(mSensorPrivacyLock); - SensorPrivacyManager spm; - spm.removeSensorPrivacyListener(this); - spm.unlinkToDeath(this); + mSpm.removeSensorPrivacyListener(this); + mSpm.unlinkToDeath(this); mRegistered = false; ALOGV("SensorPrivacyPolicy: Unregistered with SensorPrivacyManager"); } diff --git a/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h index 8bb78cde56..128314801c 100644 --- a/services/camera/libcameraservice/CameraService.h +++ b/services/camera/libcameraservice/CameraService.h @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -599,6 +600,7 @@ private: virtual void binderDied(const wp &who); private: + SensorPrivacyManager mSpm; wp mService; Mutex mSensorPrivacyLock; bool mSensorPrivacyEnabled;