Revert "spes: camera: Add more MIUI camera support"

This reverts commit 6d795fa.
shripad-jyothinath · Jul 29, 2023 · d24fe46 · d24fe46
1 parent d28accd
commit d24fe46
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 43 deletions.
diff --git a/sepolicy/private/hal_camera.te b/sepolicy/private/hal_camera.te
diff --git a/sepolicy/private/property.te b/sepolicy/private/property.te
diff --git a/sepolicy/private/property_contexts b/sepolicy/private/property_contexts
@@ -1,22 +1,7 @@
 # Camera
-ro.camera.req.fmq.size             u:object_r:vendor_ro_camera_prop:s0
-ro.camera.res.fmq.size             u:object_r:vendor_ro_camera_prop:s0
-camera.sensor.rearMain.fuseID      u:object_r:vendor_camera_prop:s0
-camera.sensor.frontAux.fuseID      u:object_r:vendor_camera_prop:s0
-camera.sensor.frontMain.fuseID     u:object_r:vendor_camera_prop:s0
-camera.sensor.rearUltra.fuseID     u:object_r:vendor_camera_prop:s0
-camera.sensor.rearTele.fuseID      u:object_r:vendor_camera_prop:s0
-vendor.sys.camerainfo              u:object_r:vendor_camera_prop:s0
-audio.camerasound.force            u:object_r:vendor_camera_prop:s0
-ro.boot.camera.                    u:object_r:vendor_camera_prop:s0
-camera.debug.superlowlight         u:object_r:vendor_camera_prop:s0
-persist.vendor.low.cutoff.         u:object_r:vendor_camera_prop:s0
-vendor.camera.watermark.en         u:object_r:vendor_camera_prop:s0
-ro.vendor.audio.us.proximity       u:object_r:vendor_camera_prop:s0
-ro.vendor.display.type             u:object_r:vendor_camera_prop:s0
-vendor.panel.display               u:object_r:vendor_camera_prop:s0
-persist.vednor.camera.             u:object_r:vendor_camera_prop:s0
-sys.cameratest.cameralevel         u:object_r:exported_camera_prop:s0
+ro.camera.req.fmq.             u:object_r:exported_default_prop:s0
+ro.camera.res.fmq.             u:object_r:exported_default_prop:s0
+vendor.sys.camerainfo          u:object_r:exported_system_prop:s0
 
 # Global
 ro.boot.hwc              u:object_r:exported_default_prop:s0

diff --git a/sepolicy/vendor/hal_camera_default.te b/sepolicy/vendor/hal_camera_default.te
@@ -1,10 +1,3 @@
-#Xiaomi Camera
-type hal_xiaomi_camera_hwservice, hwservice_manager_type;
-add_hwservice(hal_camera_default, hal_xiaomi_camera_hwservice)
-allow hal_camera_default system_server:binder call;
-
-binder_call(hal_camera_default, platform_app)
-
 # For interfacing with PowerHAL
 hal_client_domain(hal_camera_default, hal_power)
 
@@ -31,8 +24,6 @@ allow hal_camera_default proc_stat:file read;
 
 set_prop(hal_camera_default, vendor_camera_prop)
 
-get_prop(hal_camera_default, vendor_fingerprint_prop)
-
 allow hal_camera_default socket_device:sock_file write;
 allow hal_camera_default proc_stat:file { open };
 

diff --git a/sepolicy/vendor/hwservice_contexts b/sepolicy/vendor/hwservice_contexts
@@ -7,4 +7,3 @@ vendor.xiaomi.hardware.misys::IMiSys                                          u:
 vendor.xiaomi.hardware.mlipay::IMlipayService                                 u:object_r:hal_mlipay_hwservice:s0
 vendor.xiaomi.hardware.mtdservice::IMTService                                 u:object_r:hal_mtdservice_hwservice:s0
 vendor.xiaomi.hardware.displayfeature::IDisplayFeature                        u:object_r:hal_displayfeature_hwservice:s0
-vendor.xiaomi.hardware.campostproc::IMiPostProcService                  u:object_r:hal_xiaomi_camera_hwservice:s0
diff --git a/sepolicy/vendor/platform_app.te b/sepolicy/vendor/platform_app.te
@@ -5,15 +5,3 @@ allow platform_app sysfs_msm_subsys:dir search;
 allow platform_app hal_dms_hwservice:hwservice_manager find;
 binder_call(platform_app, hal_dms_default)
 get_prop(platform_app, audio_config_prop)
-
-#Add some more support for MIUI camera app
-typeattribute platform_app system_executes_vendor_violators;
-
-allow platform_app app_data_file:file execute;
-allow platform_app vendor_file:file { read open getattr map execute};
-allow platform_app hal_xiaomi_camera_hwservice:hwservice_manager find;
-
-binder_call(platform_app, hal_camera_default)
-
-get_prop(platform_app, vendor_camera_prop)
-get_prop(platform_app, vendor_fingerprint_prop)