summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinit.aries.usb.rc17
-rw-r--r--recovery.rc12
2 files changed, 20 insertions, 9 deletions
diff --git a/init.aries.usb.rc b/init.aries.usb.rc
index 9d3d336..6dbf98e 100755
--- a/init.aries.usb.rc
+++ b/init.aries.usb.rc
@@ -61,6 +61,23 @@ on property:sys.usb.config=ptp,adb
start adbd
setprop sys.usb.state $sys.usb.config
+on property:sys.usb.config=mass_storage
+ write /sys/class/android_usb/android0/enable 0
+ write /sys/class/android_usb/android0/idVendor 18d1
+ write /sys/class/android_usb/android0/idProduct 4e21
+ 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=mass_storage,adb
+ write /sys/class/android_usb/android0/enable 0
+ write /sys/class/android_usb/android0/idVendor 18d1
+ write /sys/class/android_usb/android0/idProduct 4e22
+ write /sys/class/android_usb/android0/functions $sys.usb.config
+ write /sys/class/android_usb/android0/enable 1
+ start adbd
+ setprop sys.usb.state $sys.usb.config
+
on property:sys.usb.config=rndis,dm
write /sys/class/android_usb/android0/enable 0
write /sys/class/android_usb/android0/idVendor 04e8
diff --git a/recovery.rc b/recovery.rc
index eaece03..9a75e4f 100644
--- a/recovery.rc
+++ b/recovery.rc
@@ -1,3 +1,5 @@
+import usb.rc # Renamed init.aries.usb.rc, we can't use init*.rc because the build script will delete it
+
on early-init
start ueventd
@@ -272,15 +274,7 @@ service adbd /sbin/adbd
# Always start adbd on userdebug and eng builds
on property:ro.debuggable=1
- write /sys/class/android_usb/android0/enable 0
- write /sys/class/android_usb/android0/idVendor 18D1
- write /sys/class/android_usb/android0/idProduct D001
- write /sys/class/android_usb/android0/functions adb
- write /sys/class/android_usb/android0/enable 1
- write /sys/class/android_usb/android0/iManufacturer $ro.product.manufacturer
- write /sys/class/android_usb/android0/iProduct $ro.product.model
- write /sys/class/android_usb/android0/iSerial $ro.serialno
- start adbd
+ setprop sys.usb.config mass_storage,adb
# Restart adbd so it can run as root
on property:service.adb.root=1