From 0fc8c4d49f9258b5dcc99fa596548c6b2df2dd86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Mon, 28 Dec 2020 04:19:40 -0800
Subject: [PATCH] remove dead code - property:sys.usb.configfs is never 1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bug: 172793258
Test: built and booted on oriole, tethering still works
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Iff304938e57e28b3a62784fbd0b226a20e0f53cc
---
 conf/init.gs101.usb.rc | 171 +----------------------------------------
 1 file changed, 2 insertions(+), 169 deletions(-)

diff --git a/conf/init.gs101.usb.rc b/conf/init.gs101.usb.rc
index 597b25b5..a7bc0dc5 100644
--- a/conf/init.gs101.usb.rc
+++ b/conf/init.gs101.usb.rc
@@ -72,176 +72,9 @@ on boot
     # Use USB Gadget HAL
     setprop sys.usb.configfs 2
 
-on property:sys.usb.config=accessory && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x2D00
-    write /config/usb_gadget/g1/idVendor 0x18D1
-
-on property:sys.usb.ffs.ready=1 && property:sys.usb.config=accessory,adb && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x2D01
-    write /config/usb_gadget/g1/idVendor 0x18D1
-
-on property:sys.usb.config=none && property:sys.usb.configfs=1
-    rm /config/usb_gadget/g1/configs/b.1/f4
-
-on property:sys.usb.config=mtp && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x6860
-    write /config/usb_gadget/g1/idVendor 0x04E8
-
-on property:sys.usb.config=ptp && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x6860
-    write /config/usb_gadget/g1/idVendor 0x04E8
-
 on property:sys.usb.ffs.ready=1 && property:sys.usb.config=adb && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x6860
-    write /config/usb_gadget/g1/idVendor 0x04E8
-
-on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mtp,adb && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x6860
-    write /config/usb_gadget/g1/idVendor 0x04E8
-
-on property:sys.usb.config=rndis && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x6863
-    write /config/usb_gadget/g1/idVendor 0x04E8
-
-on property:sys.usb.ffs.ready=1 && property:sys.usb.config=rndis,adb && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x6864
-    write /config/usb_gadget/g1/idVendor 0x04E8
-
-on property:sys.usb.config=ptp && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x6865
-    write /config/usb_gadget/g1/idVendor 0x04E8
-
-on property:sys.usb.ffs.ready=1 && property:sys.usb.config=ptp,adb && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x6866
-    write /config/usb_gadget/g1/idVendor 0x04E8
-
-# Enable dm,acm,adb functions once in factory build
-on property:ro.vendor.factory=1 && property:sys.usb.configfs=1 && property:sys.boot_completed=1
-    setprop sys.usb.config dm,acm,adb
-
-# We introduce lsi mode to call sys.usb.config none
-on property:sys.usb.config=rndis,acm,dm,adb && property:sys.usb.configfs=1
-    setprop sys.usb.config "none"
-    setprop sys.usb.config "lsi-rndis,acm,dm,adb"
-
-on property:sys.usb.config=lsi-rndis,acm,dm,adb && property:sys.usb.configfs=1
-    start adbd
-
-on property:sys.usb.ffs.ready=1 && property:sys.usb.config=lsi-rndis,acm,dm,adb && property:sys.usb.configfs=1
-    mkdir /config/usb_gadget/g1/functions/rndis.gs4
-    write /config/usb_gadget/g1/idProduct 0x6862
-    write /config/usb_gadget/g1/idVendor 0x04E8
-    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "rndis_acm_dm_adb"
-    symlink /config/usb_gadget/g1/functions/rndis.gs4 /config/usb_gadget/g1/configs/b.1/f1
-    symlink /config/usb_gadget/g1/functions/acm.gs6 /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/dm.gs7 /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}
-
-on property:sys.usb.config=dm,acm,adb && property:sys.usb.configfs=1
-    setprop sys.usb.config "none"
-    setprop sys.usb.config "lsi-dm,acm,adb"
-
-on property:sys.usb.config=lsi-dm,acm,adb && property:sys.usb.configfs=1
-    start adbd
-
-on property:sys.usb.ffs.ready=1 && property:sys.usb.config=lsi-dm,acm,adb && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x685D
-    write /config/usb_gadget/g1/idVendor 0x04E8
-    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "dm_acm_adb"
-    symlink /config/usb_gadget/g1/functions/dm.gs7 /config/usb_gadget/g1/configs/b.1/f1
-    symlink /config/usb_gadget/g1/functions/acm.gs6 /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/ffs.adb /config/usb_gadget/g1/configs/b.1/f3
-    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=dm,acm,uts,adb && property:sys.usb.configfs=1
-    setprop sys.usb.config "none"
-    setprop sys.usb.config "lsi-dm,acm,uts,adb"
-
-on property:sys.usb.config=lsi-dm,acm,uts,adb && property:sys.usb.configfs=1
-    start adbd
-
-on property:sys.usb.ffs.ready=1 && property:sys.usb.config=lsi-dm,acm,uts,adb && property:sys.usb.configfs=1
-    mkdir /config/usb_gadget/g1/functions/rndis.gs4
-    write /config/usb_gadget/g1/idProduct 0x6862
-    write /config/usb_gadget/g1/idVendor 0x04E8
-    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "dm_acm_uts_adb"
-    symlink /config/usb_gadget/g1/functions/dm.gs7 /config/usb_gadget/g1/configs/b.1/f1
-    symlink /config/usb_gadget/g1/functions/acm.gs6 /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/uts.gs8 /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}
-
-on property:sys.usb.config=mass_storage && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x685B
-    write /config/usb_gadget/g1/idVendor 0x04E8
-    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mass_storage"
-    symlink /config/usb_gadget/g1/functions/mass_storage.gs9 /config/usb_gadget/g1/configs/b.1/f1
-    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=mass_storage,adb && property:sys.usb.configfs=1
-    start adbd
-
-on property:sys.usb.ffs.ready=1 && property:sys.usb.config=mass_storage,adb && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x685E
-    write /config/usb_gadget/g1/idVendor 0x04E8
-    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mass_storage_adb"
-    symlink /config/usb_gadget/g1/functions/mass_storage.gs9 /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.config=mass_storage,acm && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x685E
-    write /config/usb_gadget/g1/idVendor 0x04E8
-    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "mass_storage_acm"
-    symlink /config/usb_gadget/g1/functions/mass_storage.gs9 /config/usb_gadget/g1/configs/b.1/f1
-	symlink /config/usb_gadget/g1/functions/acm.gs6 /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.config=rndis,diag && property:sys.usb.configfs=1
-    write /sys/class/android_usb/android0/enable 0
-    write /sys/class/android_usb/android0/idVendor 04e8
-    write /sys/class/android_usb/android0/idProduct 6862
-    write /sys/class/android_usb/android0/f_diag/clients diag_mdm
-    write /sys/class/android_usb/android0/functions ${sys.usb.config}
-    write /sys/class/android_usb/android0/enable 1
-    setprop sys.usb.state ${sys.usb.config}
-
-on property:sys.usb.config=rndis,diag && property:sys.usb.configfs=1
-    mkdir /config/usb_gadget/g1/functions/rndis.gs4
-    write /config/usb_gadget/g1/idProduct 0x6862
-    write /config/usb_gadget/g1/idVendor 0x04E8
-    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "rndis_diag"
-    symlink /config/usb_gadget/g1/functions/rndis.gs4 /config/usb_gadget/g1/configs/b.1/f1
-    symlink /config/usb_gadget/g1/functions/diag.gs10 /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.config=diag,acm && property:sys.usb.configfs=1
-    write /config/usb_gadget/g1/idProduct 0x685d
-    write /config/usb_gadget/g1/idVendor 0x04E8
-    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "diag_acm"
-    symlink /config/usb_gadget/g1/functions/diag.gs10 /config/usb_gadget/g1/configs/b.1/f1
-    symlink /config/usb_gadget/g1/functions/acm.gs6 /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.config=rndis,acm,diag && property:sys.usb.configfs=1
-	mkdir /config/usb_gadget/g1/functions/rndis.gs4
-    write /config/usb_gadget/g1/idProduct 0x6864
-    write /config/usb_gadget/g1/idVendor 0x04E8
-    write /config/usb_gadget/g1/configs/b.1/strings/0x409/configuration "rndis_acm_diag"
-    symlink /config/usb_gadget/g1/functions/rndis.gs4 /config/usb_gadget/g1/configs/b.1/f1
-    symlink /config/usb_gadget/g1/functions/acm.gs6 /config/usb_gadget/g1/configs/b.1/f2
-    symlink /config/usb_gadget/g1/functions/diag.gs10 /config/usb_gadget/g1/configs/b.1/f3
-    write /config/usb_gadget/g1/UDC ${sys.usb.controller}
-    setprop sys.usb.state ${sys.usb.config}
+    write /config/usb_gadget/g1/idProduct 0x4EE7
+    write /config/usb_gadget/g1/idVendor 0x18D1
 
 on property:vendor.usb.config=*
    start usbd