Merge b05dc8521bc564cea69c84f22b2df39dcbf723e6 on remote branch
Change-Id: I535c01759f899abb49f28ef69db653403e0e785b
diff --git a/etc/init.qcom.usb.sh b/etc/init.qcom.usb.sh
index 2d739c4..fb05215 100644
--- a/etc/init.qcom.usb.sh
+++ b/etc/init.qcom.usb.sh
@@ -140,7 +140,11 @@
if [ -d /config/usb_gadget ]; then
# Chip-serial is used for unique MSM identification in Product string
msm_serial=`cat /sys/devices/soc0/serial_number`;
- msm_serial_hex=`printf %08X $msm_serial`
+ # If MSM serial number is not available, then keep it blank instead of 0x00000000
+ if [ "$msm_serial" != "" ]; then
+ msm_serial_hex=`printf %08X $msm_serial`
+ fi
+
machine_type=`cat /sys/devices/soc0/machine`
setprop vendor.usb.product_string "$machine_type-$soc_hwplatform _SN:$msm_serial_hex"
diff --git a/vendor_product.mk b/vendor_product.mk
index 6b9b081..b611d91 100644
--- a/vendor_product.mk
+++ b/vendor_product.mk
@@ -29,7 +29,7 @@
PRODUCT_PROPERTY_OVERRIDES += vendor.usb.dpl.inst.name=dpl
# QDSS uses SW path on these targets
-ifneq ($(filter lahaina taro,$(TARGET_BOARD_PLATFORM)),)
+ifneq ($(filter lahaina taro parrot,$(TARGET_BOARD_PLATFORM)),)
PRODUCT_PROPERTY_OVERRIDES += vendor.usb.qdss.inst.name=qdss_sw
else
PRODUCT_PROPERTY_OVERRIDES += vendor.usb.qdss.inst.name=qdss