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

Commit 1ee455e9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Expose errors for some of the SensorPrivacyManager calls" into sc-dev

parents 4b1a37bb 9287c501

libs/sensorprivacy/SensorPrivacyManager.cpp

+17 −2
Original line number Diff line number Diff line
@@ -64,13 +64,15 @@ void SensorPrivacyManager::addSensorPrivacyListener( 
    }

}



void SensorPrivacyManager::addIndividualSensorPrivacyListener(int userId, int sensor,

status_t SensorPrivacyManager::addIndividualSensorPrivacyListener(int userId, int sensor,

        const sp<hardware::ISensorPrivacyListener>& listener)

{

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

    if (service != nullptr) {

        service->addIndividualSensorPrivacyListener(userId, sensor, listener);

        return service->addIndividualSensorPrivacyListener(userId, sensor, listener)

                .transactionError();

    }

    return UNEXPECTED_NULL;

}



void SensorPrivacyManager::removeSensorPrivacyListener(
@@ -106,6 +108,19 @@ bool SensorPrivacyManager::isIndividualSensorPrivacyEnabled(int userId, int sens 
    return false;

}



status_t SensorPrivacyManager::isIndividualSensorPrivacyEnabled(int userId, int sensor,

        bool &returnVal)

{

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

    if (service != nullptr) {

        binder::Status res = service->isIndividualSensorPrivacyEnabled(userId, sensor, &returnVal);

        return res.transactionError();

    }

    // if the SensorPrivacyManager is not available then assume sensor privacy is disabled

    returnVal = false;

    return UNKNOWN_ERROR;

}



status_t SensorPrivacyManager::linkToDeath(const sp<IBinder::DeathRecipient>& recipient)

{

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

libs/sensorprivacy/include/sensorprivacy/SensorPrivacyManager.h

+2 −1
Original line number Diff line number Diff line
@@ -36,11 +36,12 @@ public: 
    SensorPrivacyManager();



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

    void addIndividualSensorPrivacyListener(int userId, int sensor,

    status_t addIndividualSensorPrivacyListener(int userId, int sensor,

            const sp<hardware::ISensorPrivacyListener>& listener);

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

    bool isSensorPrivacyEnabled();

    bool isIndividualSensorPrivacyEnabled(int userId, int sensor);

    status_t isIndividualSensorPrivacyEnabled(int userId, int sensor, bool &result);



    status_t linkToDeath(const sp<IBinder::DeathRecipient>& recipient);

    status_t unlinkToDeath(const sp<IBinder::DeathRecipient>& recipient);