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

Commit 73e8eb50 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix naming convention in CameraService" into sc-dev am: 892e4522 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/13473051

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b5918d9bcb4f6745b6957b3e0189adc63442db0
parents 7317e689 892e4522

services/camera/libcameraservice/CameraService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -3249,8 +3249,8 @@ status_t CameraService::SensorPrivacyPolicy::registerSelfForIndividual(int userI 
    }



    mRegistered = true;

    isIndividual = true;

    this->userId = userId;

    mIsIndividual = true;

    mUserId = userId;

    ALOGV("SensorPrivacyPolicy: Registered with SensorPrivacyManager");

    return OK;

}
@@ -3276,8 +3276,8 @@ binder::Status CameraService::SensorPrivacyPolicy::onSensorPrivacyChanged(bool e 
    // if sensor privacy is enabled then block all clients from accessing the camera

    sp<CameraService> service = mService.promote();

    if (service != nullptr) {

        if (isIndividual) {

            service->setMuteForAllClients(userId, enabled);

        if (mIsIndividual) {

            service->setMuteForAllClients(mUserId, enabled);

        } else {

            if (enabled) {

                service->blockAllClients();

services/camera/libcameraservice/CameraService.h

+3 −3
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ private: 
        public:

            explicit SensorPrivacyPolicy(wp<CameraService> service)

                    : mService(service), mSensorPrivacyEnabled(false), mRegistered(false),

                      isIndividual(false), userId(0) {}

                      mIsIndividual(false), mUserId(0) {}



            void registerSelf();

            status_t registerSelfForIndividual(int userId);
@@ -657,8 +657,8 @@ private: 
            Mutex mSensorPrivacyLock;

            bool mSensorPrivacyEnabled;

            bool mRegistered;

            bool isIndividual;

            userid_t userId;

            bool mIsIndividual;

            userid_t mUserId;

    };



    sp<UidPolicy> mUidPolicy;