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

Commit 05c49e90 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "CameraService: hold onto SensorPrivacyManager" am: 733c7287 am: 9279fa95 am: 16dd56fa 

Change-Id: Ibe7d0626f3c93cabc933ae1b8fbc678c3052b19e
parents 0b890e62 16dd56fa

services/camera/libcameraservice/CameraService.cpp

+5 −8
Original line number Diff line number Diff line
@@ -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;

    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");
@@ -3270,9 +3268,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");

}

services/camera/libcameraservice/CameraService.h

+2 −0
Original line number Diff line number Diff line
@@ -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;