Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50108b3f authored by Jerry Zhang's avatar Jerry Zhang
Browse files

Remove sys.usb.ffs.mtp.ready property 

With the usb control fd changes, there
is no longer a need to wait for this
property to trigger before starting the
connection.

Bug: 72877174
Test: switch config to mtp/ptp
Change-Id: Ib29419e7948025be3f3295106cad18943d314f0b
parent 1f70d1ca

rootdir/init.usb.configfs.rc

+4 −7
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ on property:sys.usb.config=none && property:sys.usb.configfs=1 
    write /config/usb_gadget/g1/UDC "none"

    stop adbd

    setprop sys.usb.ffs.ready 0

    setprop sys.usb.ffs.mtp.ready 0

    write /config/usb_gadget/g1/bDeviceClass 0

    write /config/usb_gadget/g1/bDeviceSubClass 0

    write /config/usb_gadget/g1/bDeviceProtocol 0
@@ -24,7 +23,7 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=adb && property:sys.u 
    write /config/usb_gadget/g1/UDC ${sys.usb.controller}

    setprop sys.usb.state ${sys.usb.config}



on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=mtp && property:sys.usb.configfs=1

on property:sys.usb.config=mtp && property:sys.usb.configfs=1

    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mtp"

    symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1

    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
@@ -33,15 +32,14 @@ on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=mtp && property:s 
on property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1

    start adbd



on property:sys.usb.ffs.ready=1 && property:sys.usb.ffs.mtp.ready=1 && \

property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1

on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1

    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mtp_adb"

    symlink /config/usb_gadget/g1/functions/mtp.gs0 /config/usb_gadget/g1/configs/b.1/f1

    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2

    write /config/usb_gadget/g1/UDC ${sys.usb.controller}

    setprop sys.usb.state ${sys.usb.config}



on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=ptp && property:sys.usb.configfs=1

on property:sys.usb.config=ptp && property:sys.usb.configfs=1

    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "ptp"

    symlink /config/usb_gadget/g1/functions/ptp.gs1 /config/usb_gadget/g1/configs/b.1/f1

    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
@@ -50,8 +48,7 @@ on property:sys.usb.ffs.mtp.ready=1 && property:sys.usb.config=ptp && property:s 
on property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1

    start adbd



on property:sys.usb.ffs.ready=1 && property:sys.usb.ffs.mtp.ready=1 && \

property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1

on property:sys.usb.ffs.ready=1 && property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1

    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "ptp_adb"

    symlink /config/usb_gadget/g1/functions/ptp.gs1 /config/usb_gadget/g1/configs/b.1/f1

    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f2