From 41cdc794be204deab89f13addf402014699802b2 Mon Sep 17 00:00:00 2001 From: Sriharsha Allenki Date: Fri, 18 Sep 2020 14:20:47 +0530 Subject: [PATCH] sdm845-common: init.qcom.usb.rc: Fix fallback to default composition from RNDIS If the sys.usb.state is set to any other value other than rndis(rndis,adb) when tethering is enabled through UI, the USB device manager falls back to the default or previous composition. If a RNDIS is enabled with along with other debug functions using the persist.vendor.usb.config.extra, set the sys.usb.state to rndis(rndis,adb) irrespective of the config that is being enabled to prevent the fallback. Change-Id: Ib4e120895e62fc14ac11941b6b46cc7f0460ede8 --- rootdir/etc/init.qcom.usb.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rootdir/etc/init.qcom.usb.rc b/rootdir/etc/init.qcom.usb.rc index 4055eb0..cf21002 100644 --- a/rootdir/etc/init.qcom.usb.rc +++ b/rootdir/etc/init.qcom.usb.rc @@ -653,7 +653,7 @@ on property:sys.usb.config=rndis,diag,qdss && property:sys.usb.configfs=1 symlink /config/usb_gadget/g1/functions/${vendor.usb.diag.func.name}.diag /config/usb_gadget/g1/configs/b.1/f2 symlink /config/usb_gadget/g1/functions/qdss.${vendor.usb.qdss.inst.name} /config/usb_gadget/g1/configs/b.1/f3 write /config/usb_gadget/g1/UDC ${sys.usb.controller} - setprop sys.usb.state ${sys.usb.config} + setprop sys.usb.state rndis on property:sys.usb.config=rndis,diag,qdss,adb && property:sys.usb.configfs=1 start adbd @@ -677,7 +677,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,diag,qdss,adb & symlink /config/usb_gadget/g1/functions/qdss.${vendor.usb.qdss.inst.name} /config/usb_gadget/g1/configs/b.1/f3 symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f4 write /config/usb_gadget/g1/UDC ${sys.usb.controller} - setprop sys.usb.state ${sys.usb.config} + setprop sys.usb.state rndis,adb on property:sys.usb.config=ncm && property:sys.usb.configfs=1 write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "ncm"