Merge "CameraService: hold onto SensorPrivacyManager" am: 733c728752 am: 9279fa954a am: 16dd56fa2d

Change-Id: Ibe7d0626f3c93cabc933ae1b8fbc678c3052b19e

services/camera/libcameraservice/CameraService.cpp

@@ -56,7 +56,6 @@
 #include <media/IMediaHTTPService.h>
 #include <media/mediaplayer.h>
 #include <mediautils/BatteryNotifier.h>
-#include <sensorprivacy/SensorPrivacyManager.h>
 #include <utils/Errors.h>
 #include <utils/Log.h>
 #include <utils/String16.h>
@@ -3258,10 +3257,9 @@ void CameraService::SensorPrivacyPolicy::registerSelf() {
     if (mRegistered) {
         return;
     }
-    SensorPrivacyManager spm;
+    mSpm.addSensorPrivacyListener(this);
-    spm.addSensorPrivacyListener(this);
+    mSensorPrivacyEnabled = mSpm.isSensorPrivacyEnabled();
-    mSensorPrivacyEnabled = spm.isSensorPrivacyEnabled();
+    status_t res = mSpm.linkToDeath(this);
-    status_t res = spm.linkToDeath(this);
     if (res == OK) {
         mRegistered = true;
         ALOGV("SensorPrivacyPolicy: Registered with SensorPrivacyManager");
@@ -3270,9 +3268,8 @@ void CameraService::SensorPrivacyPolicy::registerSelf() {
 
 void CameraService::SensorPrivacyPolicy::unregisterSelf() {
     Mutex::Autolock _l(mSensorPrivacyLock);
-    SensorPrivacyManager spm;
+    mSpm.removeSensorPrivacyListener(this);
-    spm.removeSensorPrivacyListener(this);
+    mSpm.unlinkToDeath(this);
-    spm.unlinkToDeath(this);
     mRegistered = false;
     ALOGV("SensorPrivacyPolicy: Unregistered with SensorPrivacyManager");
 }

services/camera/libcameraservice/CameraService.h

@@ -31,6 +31,7 @@
 #include <binder/IAppOpsCallback.h>
 #include <binder/IUidObserver.h>
 #include <hardware/camera.h>
+#include <sensorprivacy/SensorPrivacyManager.h>
 
 #include <android/hardware/camera/common/1.0/types.h>
 
@@ -656,6 +657,7 @@ private:
             virtual void binderDied(const wp<IBinder> &who);
 
         private:
+            SensorPrivacyManager mSpm;
             wp<CameraService> mService;
             Mutex mSensorPrivacyLock;
             bool mSensorPrivacyEnabled;