Revert "Implement camera privacy allowlist."
Revert submission 25847276-camera_privacy_allowlist
Reason for revert: Culprit for b/324646239.
Reverted changes: /q/submissionid:25847276-camera_privacy_allowlist
Change-Id: Ia989dab3482ff42626ab197461c150a392839622
diff --git a/libs/sensorprivacy/SensorPrivacyManager.cpp b/libs/sensorprivacy/SensorPrivacyManager.cpp
index fe93786..57c74ee 100644
--- a/libs/sensorprivacy/SensorPrivacyManager.cpp
+++ b/libs/sensorprivacy/SensorPrivacyManager.cpp
@@ -108,7 +108,7 @@
bool SensorPrivacyManager::isToggleSensorPrivacyEnabled(int sensor)
{
- sp<hardware::ISensorPrivacyManager> service = getService();
+ sp<hardware::ISensorPrivacyManager> service = getService();
if (service != nullptr) {
bool result;
service->isCombinedToggleSensorPrivacyEnabled(sensor, &result);
@@ -143,39 +143,6 @@
return UNKNOWN_ERROR;
}
-int SensorPrivacyManager::getToggleSensorPrivacyState(int toggleType, int sensor)
-{
- sp<hardware::ISensorPrivacyManager> service = getService();
- if (service != nullptr) {
- int result;
- service->getToggleSensorPrivacyState(toggleType, sensor, &result);
- return result;
- }
- // if the SensorPrivacyManager is not available then assume sensor privacy is disabled
- return DISABLED;
-}
-
-std::vector<hardware::CameraPrivacyAllowlistEntry>
- SensorPrivacyManager::getCameraPrivacyAllowlist(){
- sp<hardware::ISensorPrivacyManager> service = getService();
- std::vector<hardware::CameraPrivacyAllowlistEntry> result;
- if (service != nullptr) {
- service->getCameraPrivacyAllowlist(&result);
- return result;
- }
- return result;
-}
-
-bool SensorPrivacyManager::isCameraPrivacyEnabled(String16 packageName){
- sp<hardware::ISensorPrivacyManager> service = getService();
- if (service != nullptr) {
- bool result;
- service->isCameraPrivacyEnabled(packageName, &result);
- return result;
- }
- return false;
-}
-
status_t SensorPrivacyManager::linkToDeath(const sp<IBinder::DeathRecipient>& recipient)
{
sp<hardware::ISensorPrivacyManager> service = getService();