Merge "Revert "Implement camera privacy allowlist."" into main

Author: Priyanka Advani

libs/sensorprivacy/Android.bp

@@ -57,7 +57,6 @@ cc_library_shared {
 filegroup {
     name: "libsensorprivacy_aidl",
     srcs: [
-        "aidl/android/hardware/CameraPrivacyAllowlistEntry.aidl",
         "aidl/android/hardware/ISensorPrivacyListener.aidl",
         "aidl/android/hardware/ISensorPrivacyManager.aidl",
     ],

libs/sensorprivacy/SensorPrivacyManager.cpp

@@ -108,7 +108,7 @@ bool SensorPrivacyManager::isSensorPrivacyEnabled()
 
 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 @@ status_t SensorPrivacyManager::isToggleSensorPrivacyEnabled(int toggleType, int
     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();

libs/sensorprivacy/aidl/android/hardware/CameraPrivacyAllowlistEntry.aidl

@@ -21,5 +21,4 @@ package android.hardware;
  */
 oneway interface ISensorPrivacyListener {
     void onSensorPrivacyChanged(int toggleType, int sensor, boolean enabled);
-    void onSensorPrivacyStateChanged(int toggleType, int sensor, int state);
 }

libs/sensorprivacy/aidl/android/hardware/ISensorPrivacyListener.aidl

@@ -16,7 +16,6 @@
 
 package android.hardware;
 
-import android.hardware.CameraPrivacyAllowlistEntry;
 import android.hardware.ISensorPrivacyListener;
 
 /** @hide */
@@ -42,15 +41,4 @@ interface ISensorPrivacyManager {
     void setToggleSensorPrivacy(int userId, int source, int sensor, boolean enable);
 
     void setToggleSensorPrivacyForProfileGroup(int userId, int source, int sensor, boolean enable);
-
-    List<CameraPrivacyAllowlistEntry> getCameraPrivacyAllowlist();
-
-    int getToggleSensorPrivacyState(int toggleType, int sensor);
-
-    void setToggleSensorPrivacyState(int userId, int source, int sensor, int state);
-
-    void setToggleSensorPrivacyStateForProfileGroup(int userId, int source, int sensor, int  state);
-
-    boolean isCameraPrivacyEnabled(String packageName);
-
 }

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

@@ -32,22 +32,12 @@ class SensorPrivacyManager
 public:
     enum {
         TOGGLE_SENSOR_MICROPHONE = 1,
-        TOGGLE_SENSOR_CAMERA = 2,
-        TOGGLE_SENSOR_UNKNOWN = -1
+        TOGGLE_SENSOR_CAMERA = 2
     };
 
     enum {
         TOGGLE_TYPE_SOFTWARE = 1,
-        TOGGLE_TYPE_HARDWARE = 2,
-        TOGGLE_TYPE_UNKNOWN = -1
-    };
-
-    enum {
-        ENABLED = 1,
-        DISABLED = 2,
-        AUTOMOTIVE_DRIVER_ASSISTANCE_HELPFUL_APPS = 3,
-        AUTOMOTIVE_DRIVER_ASSISTANCE_REQUIRED_APPS = 4,
-        AUTOMOTIVE_DRIVER_ASSISTANCE_APPS = 5
+        TOGGLE_TYPE_HARDWARE = 2
     };
 
     SensorPrivacyManager();
@@ -61,9 +51,6 @@ class SensorPrivacyManager
     bool isToggleSensorPrivacyEnabled(int sensor);
     bool isToggleSensorPrivacyEnabled(int toggleType, int sensor);
     status_t isToggleSensorPrivacyEnabled(int toggleType, int sensor, bool &result);
-    int getToggleSensorPrivacyState(int toggleType, int sensor);
-    std::vector<hardware::CameraPrivacyAllowlistEntry> getCameraPrivacyAllowlist();
-    bool isCameraPrivacyEnabled(String16 packageName);
 
     status_t linkToDeath(const sp<IBinder::DeathRecipient>& recipient);
     status_t unlinkToDeath(const sp<IBinder::DeathRecipient>& recipient);

libs/sensorprivacy/include/sensorprivacy/SensorPrivacyManager.h

@@ -340,12 +340,6 @@ class SensorService :
             binder::Status onSensorPrivacyChanged(int toggleType, int sensor,
                                                   bool enabled);
 
-            // This callback is used for additional automotive-specific states for sensor privacy
-            // such as AUTO_DRIVER_ASSISTANCE_APPS. The newly defined states will only be valid
-            // for camera privacy on automotive devices. onSensorPrivacyChanged() will still be
-            // invoked whenever the enabled status of a toggle changes.
-            binder::Status onSensorPrivacyStateChanged(int, int, int) {return binder::Status::ok();}
-
         protected:
             std::atomic_bool mSensorPrivacyEnabled;
             wp<SensorService> mService;