diff options
| author | Jerry Zhang <zhangjerry@google.com> | 2017-09-06 12:29:20 -0700 |
|---|---|---|
| committer | Jerry Zhang <zhangjerry@google.com> | 2017-09-06 16:08:22 -0700 |
| commit | e7d630f280a53c3a94e0f5efb8e3a568d45463eb (patch) | |
| tree | 7b27e9e429866688c61923005445f64856b43d03 | |
| parent | 3057aa4e6ce4c1f139e473a6152781b716d29ebc (diff) | |
| download | bullhead-e7d630f280a53c3a94e0f5efb8e3a568d45463eb.tar.gz | |
Revert "bullhead: Enable MTP over functionfs"
This reverts commit ace8ef676798ad4063103429b637aa5df52353bf.
3.10 kernel is too old to use functionfs with osdescs. We need
to revert to f_mtp to get os_desc functionality.
Test: Use bullhead mtp, sniff for os descs
Bug: 64790536
Change-Id: I81e2227c68384879ef73e1712180ac725e27e6c9
| -rw-r--r-- | init.bullhead.usb.rc | 10 |
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} |