From 3d72a5b29f412a3c5424bf160de732c570e8b92a Mon Sep 17 00:00:00 2001 From: Jimmy Hu Date: Wed, 17 May 2023 06:06:03 +0000 Subject: [PATCH] Disable USB contaminant detection when the disable flag is true (ported from 6b1106498e1164f46b9a895ed2258a20a0c7a7b5) Bug: 263916675 Bug: 264231895 Test: setprop vendor.usb.contaminantdisable true Change-Id: I57ea8280e4af3720dce9d9174b1cc24066c5324e Signed-off-by: Jimmy Hu --- Android.bp | 7 +++++++ conf/init.zuma.usb.rc | 3 +++ device.mk | 4 ++++ disable_contaminant_detection.sh | 7 +++++++ 4 files changed, 21 insertions(+) create mode 100644 disable_contaminant_detection.sh diff --git a/Android.bp b/Android.bp index ef1e4b44..bf7fac7e 100644 --- a/Android.bp +++ b/Android.bp @@ -34,3 +34,10 @@ license { "NOTICE", ], } + +sh_binary { + name: "disable_contaminant_detection.sh", + src: "disable_contaminant_detection.sh", + vendor: true, + sub_dir: "hw", +} diff --git a/conf/init.zuma.usb.rc b/conf/init.zuma.usb.rc index d8925eaa..b6bf02d8 100644 --- a/conf/init.zuma.usb.rc +++ b/conf/init.zuma.usb.rc @@ -195,6 +195,9 @@ on property:sys.usb.config=charger && property:sys.usb.configfs=1 on property:ro.bootmode=usbuwb setprop persist.vendor.usb.usbradio.config uwb_acm +on property:vendor.usb.contaminantdisable=true + exec /vendor/bin/hw/disable_contaminant_detection.sh + on property:persist.vendor.usb.displayport.enabled=1 write /sys/class/typec/port0/port0.0/mode1/active "yes" diff --git a/device.mk b/device.mk index e9eb238d..be0249d0 100644 --- a/device.mk +++ b/device.mk @@ -359,6 +359,10 @@ PRODUCT_COPY_FILES += \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem +# Shell scripts +PRODUCT_PACKAGES += \ + disable_contaminant_detection.sh + include device/google/gs-common/insmod/insmod.mk # Insmod config files diff --git a/disable_contaminant_detection.sh b/disable_contaminant_detection.sh new file mode 100644 index 00000000..07149643 --- /dev/null +++ b/disable_contaminant_detection.sh @@ -0,0 +1,7 @@ +#!/vendor/bin/sh + +for f in /sys/devices/platform/10cb0000.hsi2c/i2c-*/*-0025; do + if [ -d $f ]; then + echo 0 > $f/contaminant_detection; + fi +done