summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-09-07 01:42:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-09-07 01:42:26 +0000
commit7647637b7ba6e94b63d2d0377d0b4e41bfe8ec6c (patch)
tree63099fb49bc4697f7ace80464dbb35e7947fcf2a
parentbe5173cf62512db062a5171ebbb7ac021a97de16 (diff)
parente7d630f280a53c3a94e0f5efb8e3a568d45463eb (diff)
downloadbullhead-7647637b7ba6e94b63d2d0377d0b4e41bfe8ec6c.tar.gz
Merge "Revert "bullhead: Enable MTP over functionfs"" into oc-mr1-dev
-rw-r--r--init.bullhead.usb.rc10
1 files changed, 4 insertions, 6 deletions
diff --git a/init.bullhead.usb.rc b/init.bullhead.usb.rc
index e506c97..135f556 100644
--- a/init.bullhead.usb.rc
+++ b/init.bullhead.usb.rc
@@ -26,17 +26,15 @@ on boot
chmod 664 /sys/class/dual_role_usb/otg_default/mode
on post-fs
- mkdir /dev/usb-ffs 0775 shell shell
+ mkdir /dev/usb-ffs 0770 shell shell
mkdir /dev/usb-ffs/adb 0770 shell shell
mount functionfs adb /dev/usb-ffs/adb noatime uid=2000,gid=2000,no_disconnect=1
- mkdir /dev/usb-ffs/mtp 0770 mtp mtp
- mount functionfs mtp /dev/usb-ffs/mtp noatime rmode=0770,fmode=0660,uid=1024,gid=1024,no_disconnect=1
write /sys/module/g_android/parameters/mtp_rx_req_len 131072
write /sys/module/g_android/parameters/mtp_tx_reqs 32
setprop sys.usb.ffs.max_write 262144
setprop sys.usb.ffs.max_read 262144
setprop sys.usb.mtp.device_type 3
- write /sys/class/android_usb/android0/f_ffs/aliases adb,mtp
+ write /sys/class/android_usb/android0/f_ffs/aliases adb
on post-fs-data
write /sys/module/rndis_ipa/parameters/min_cpu_freq 1036800
@@ -101,7 +99,7 @@ on property:sys.usb.config=ptp
write /sys/class/android_usb/android0/bDeviceClass 0
write /sys/class/android_usb/android0/bDeviceSubClass 0
write /sys/class/android_usb/android0/bDeviceProtocol 0
- write /sys/class/android_usb/android0/functions mtp
+ write /sys/class/android_usb/android0/functions ptp
write /sys/class/android_usb/android0/enable 1
setprop sys.usb.state ${sys.usb.config}
@@ -112,7 +110,7 @@ on property:sys.usb.config=ptp,adb
write /sys/class/android_usb/android0/bDeviceClass 0
write /sys/class/android_usb/android0/bDeviceSubClass 0
write /sys/class/android_usb/android0/bDeviceProtocol 0
- write /sys/class/android_usb/android0/functions mtp,adb
+ write /sys/class/android_usb/android0/functions ptp,adb
write /sys/class/android_usb/android0/enable 1
start adbd
setprop sys.usb.state ${sys.usb.config}