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

Commit 6b93d6a8 authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Update mic/camera toggles api" into sc-dev am: bb483014 

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

Change-Id: Iff0710a2ca3d0f095362393c3ecaec1508f5687d
parents ebe334c9 bb483014

libs/sensorprivacy/SensorPrivacyManager.cpp

+16 −0
Original line number Diff line number Diff line
@@ -55,6 +55,22 @@ sp<hardware::ISensorPrivacyManager> SensorPrivacyManager::getService() 
    return service;

}



bool SensorPrivacyManager::supportsSensorToggle(int sensor) {

    if (mSupportedCache.find(sensor) == mSupportedCache.end()) {

        sp<hardware::ISensorPrivacyManager> service = getService();

        if (service != nullptr) {

            bool result;

            service->supportsSensorToggle(sensor, &result);

            mSupportedCache[sensor] = result;

            return result;

        }

        // if the SensorPrivacyManager is not available then assume sensor privacy feature isn't

        // supported

        return false;

    }

    return mSupportedCache[sensor];

}



void SensorPrivacyManager::addSensorPrivacyListener(

        const sp<hardware::ISensorPrivacyListener>& listener)

{

libs/sensorprivacy/aidl/android/hardware/ISensorPrivacyManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.hardware.ISensorPrivacyListener; 


/** @hide */

interface ISensorPrivacyManager {

    boolean supportsSensorToggle(int sensor);



    void addSensorPrivacyListener(in ISensorPrivacyListener listener);



    void addIndividualSensorPrivacyListener(int userId, int sensor, in ISensorPrivacyListener listener);

libs/sensorprivacy/include/sensorprivacy/SensorPrivacyManager.h

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 


#include <utils/threads.h>



#include <unordered_map>



// ---------------------------------------------------------------------------

namespace android {
@@ -35,6 +37,7 @@ public: 


    SensorPrivacyManager();



    bool supportsSensorToggle(int sensor);

    void addSensorPrivacyListener(const sp<hardware::ISensorPrivacyListener>& listener);

    status_t addIndividualSensorPrivacyListener(int userId, int sensor,

            const sp<hardware::ISensorPrivacyListener>& listener);
@@ -50,6 +53,8 @@ private: 
    Mutex mLock;

    sp<hardware::ISensorPrivacyManager> mService;

    sp<hardware::ISensorPrivacyManager> getService();



    std::unordered_map<int, bool> mSupportedCache;

};