Merge "Disable USB contaminant detection when the disable flag is true" into udc-d1-dev am: 756902cd89
Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23343089 Change-Id: I1cb336cc3c8b08771c74a48a223b85f4b369dbd4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
8916a8a640
4 changed files with 21 additions and 0 deletions
|
@ -34,3 +34,10 @@ license {
|
||||||
"NOTICE",
|
"NOTICE",
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sh_binary {
|
||||||
|
name: "disable_contaminant_detection.sh",
|
||||||
|
src: "disable_contaminant_detection.sh",
|
||||||
|
vendor: true,
|
||||||
|
sub_dir: "hw",
|
||||||
|
}
|
||||||
|
|
|
@ -195,6 +195,9 @@ on property:sys.usb.config=charger && property:sys.usb.configfs=1
|
||||||
on property:ro.bootmode=usbuwb
|
on property:ro.bootmode=usbuwb
|
||||||
setprop persist.vendor.usb.usbradio.config uwb_acm
|
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
|
on property:persist.vendor.usb.displayport.enabled=1
|
||||||
write /sys/class/typec/port0/port0.0/mode1/active "yes"
|
write /sys/class/typec/port0/port0.0/mode1/active "yes"
|
||||||
|
|
||||||
|
|
|
@ -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.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \
|
||||||
device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem
|
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
|
include device/google/gs-common/insmod/insmod.mk
|
||||||
|
|
||||||
# Insmod config files
|
# Insmod config files
|
||||||
|
|
7
disable_contaminant_detection.sh
Normal file
7
disable_contaminant_detection.sh
Normal file
|
@ -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
|
Loading…
Add table
Add a link
Reference in a new issue