Commit Graph

27 Commits

Author SHA1 Message Date
that
a1ad19f0b7 mtp: get rid of string streams, reduces binary size a bit
Change-Id: Iaa91eaac8269f02783c904d890641861ec747d11
2014-12-29 17:10:38 +01:00
Ethan Yonker
abb5c4ead0 Move sleep during MTP startup to MTP thread
Some devices are very slow to respond to the sysfs requests. To
prevent delaying the main GUI from booting during TWRP startup, we
move the sleep delay to just before we open the MTP device and
into the MTP thread so that it does not hold up the main TWRP
thread.

Change-Id: Ic931ef317d0fb7ef4dfdef46a32f68a014ff62c0
2014-12-29 17:01:41 +01:00
Ethan Yonker
4bfabab005 Check for valid MTP_Storage_ID before adding or removing
Attempting to add a storage ID of 0 was causing a seg fault.

Change-Id: If8797186405be36ee70dbca63bd1063a62ba2812
2014-12-29 16:25:32 +01:00
Ethan Yonker
ee8b314dbc Improve MTPServer logging of read errors
Unless MTP debug logging is enabled, you will miss the error and
will not know that something went wrong in the log.

Change-Id: I51f4758b415eb38e808ec8b1c9788b505bf88c65
2014-12-29 09:24:23 -06:00
bigbiff
0c53203efe Fix else if and maxFileSize initializer.
Change-Id: Iac7852a4fb2add5744d5ea424d6ad5a82828f102
2014-12-22 04:52:56 +01:00
Ethan Yonker
726a020632 MTP add/remove storage instead of disabling MTP
Implement a pipe between TWRP and MTP to allow TWRP to tell MTP
to remove storage partitions as they become unavailable (e.g.
during a wipe, unmount, etc) instead of disabling MTP completely.
This includes some fixes and improvements in destructors to
properly remove / delete various items. This also means that we
will not be toggling adb off and on quite as often.

I do not like that we had to add another thread, but we were
unable to use select() on the mtp_usb character device because
this device does not support polling. Select always returned
indicating that the mtp file descriptor was ready to be read and
the resulting read would block. The read block prevented us from
being able to include reading of the pipe between TWRP and MTP in
the main MTP thread.

We might want to add a return pipe letting TWRP know if the
removal of the storage device was successful, but I am not sure
how we want to implement this. It would invovle timeouts in both
TWRP and MTP to ensure that we returned a failure indicator in a
timely manner to TWRP and prevent deleting the storage device in
the case of a failure. Right now we make no attempt to ensure that
an MTP operation is underway like a large file transfer, but we
were not doing anything like this in the past. In some respects we
have limited control over what happens. If the user installs a
zip that unmounts a storage partition, we will not know about the
change in storage status anyway. Regular Android does not have
these troubles because partitions rarely get unmounted like in
recovery. At some point, we have to hold the user accountable for
performing actions that may remove a storage partition while they
are using MTP anyway.

Ideally we do not want to toggle the USB IDs and thus toggle adb
off and on during early boot, but I am not sure what the best way
to handle that at this time.

Change-Id: I9343e5396bf6023d3b994de1bf01ed91d129bc14
2014-12-19 16:27:34 -06:00
Ethan Yonker
4b94cfd391 Attempt to set the proper uid/gid/contexts on new files and dirs
Files and folders that we create during backups, copy log, or MTP
operations often do not have the proper uid/gid/contexts assigned.
We will attempt to read the proper contexts from the settings
storage path and assign those same contexts to any files or dirs
that we create.

Change-Id: I769f9479854122b49b499de2175e6e2d026f8afd
2014-12-12 09:20:42 -06:00
bigbiff
7cb4c3322b add function to partition.cpp to return max file size to mtp responder
Change-Id: If8114b5eac741db6c512fb35cb48e3825c2ff098
2014-12-04 17:32:27 +01:00
Ethan Yonker
cdc3ef5feb TWRP MTP: make sure inotify_fd is set
Originally the inotify_init() call was part of a separate thread
which would occasionally allow the readDirs function to run and
start trying to add watches before inotify_fd was init'ed properly
and result in the add watch failing. This patch set relocates the
inotify_init call to happen outside and before starting the
separate thread to ensure that inotify_fd is set properly.

Change-Id: I8748c23473b60b57887df9d692834f3d2b249802
2014-11-25 15:00:08 -06:00
Ethan Yonker
6029e934f4 Fix some includes that are not longer present
Change-Id: Ic9509b0dc7f71ae64f64cc891868a2543eee4321
2014-11-06 09:31:48 -06:00
that
5823d48f9e mtp: fix log spam: findNode not finding a node is not an error
The requested file might be on another storage.

Change-Id: Ia71525058b616a28a8ea2b4ab48ebac1c790757e
2014-10-14 15:19:29 +02:00
that
9e0593eaf6 mtp: cleanup, fixes and performance improvements
- use std::map instead of linked list
- read directories on demand
- fix writing zip files to storage root
- fix creating directories
- lots of minor fixes
- simplify generation of storage IDs and make them spec compliant

Change-Id: I2137c27549ddbdc58466f2e3aeda464fac70a3c5
2014-10-08 18:34:39 +02:00
Jenkins
7e22c27609 atime is access time, let's just use mtime
Change-Id: I828bc473a263868bd82b042c4009701d09a77a1f
2014-10-07 20:55:39 +02:00
Motorhead1991
e444918539 Include no strict aliasing for MTP
Change-Id: I570bb1c1387ec16fb062d7844af12b24c74e3755
2014-09-13 04:18:45 +02:00
Ethan Yonker
8613dc0278 Fix handling of MTP fork/child process
Change-Id: Iacd8a38d21e9c8b0dfafefbeb646f46cd3ba02a1
2014-09-11 09:28:20 -05:00
Ethan Yonker
a1f38054c7 MTP: Build flag for setting custom MTP device/path
Change-Id: Ic19ec61dc6cb08df00eb1326d96262b46bb93bfb
2014-09-11 08:28:51 -05:00
bigbiff bigbiff
1812c89f39 MTP: fix some code paths
Still doesn't fix the bug of copying zip files to the root of
storage in Windows.

Change-Id: Iddec66a49c17cf48cbd1c67ad6679349ece8e05c
2014-09-09 09:56:14 -05:00
bigbiff bigbiff
26c47962ef mktime_tz is blocking, don't use it
Change-Id: I0a66a69b68d975389302ae4361c9c106eb722538
2014-09-06 18:34:40 -04:00
Ethan Yonker
8dfa77780f MTP: Use fork instead of pthread
Change-Id: I95cf6f4def0c86f40c775738f0712323f0a0f146
2014-09-04 21:59:20 -05:00
Ethan Yonker
241a3ce4c5 MTP: Better handling of stat
Do some error checking of lstat calls and better handle those
errors.
Use lstat instead of dirent to check if an item is a directory
because dirent does not return the correct item type when using
exfat-fuse.

Change-Id: I0d008aff55a0e0b4fbeae24cf8d0c04453b7b77e
2014-09-04 13:05:35 -05:00
Dees Troy
2e07c0493e MTP Fix rename in Windows
Change-Id: Ieef2fc16aac1da3d03908cfb285895954b42a14a
2014-09-04 15:01:30 +00:00
Dees Troy
53ea0a166c MTP Fix property list for multiple storage devices
Change-Id: Ice23fef31439a6c88d0a12380688eccd8dc3a71c
2014-09-04 14:17:50 +00:00
Ethan Yonker
6f49e11d8a Prevent MTP enable on startup if crash detected
Change-Id: Ie1388a8acadf714a29721dd90c7f9a8aa38a860d
2014-09-03 21:42:49 -05:00
Ethan Yonker
5e083dcc20 Improve MtpStorage handling when more than one storage is present
Change-Id: I02f1984d02a85d9fd42450cc3772e88a43d9e9ff
2014-09-03 15:06:00 -05:00
Ethan Yonker
6d154c4fe2 Allow toggle of MTP debug
Via command line in TWRP:
twrp set tw_mtp_debug 1

This will enable debugging for MTP. You will need to disable and
re-enable MTP in order to see the debug logging.

Change-Id: Ia7bb0c584e10a4322b65ecf80a67ed7ee836b38e
2014-09-03 14:22:50 -05:00
Ethan Yonker
20fd25c231 Improve error handling during MTP startup
Change-Id: I9395481dd8d9cbd3346fe6682557236b48b4d6cd
2014-09-03 14:04:43 -05:00
bigbiff bigbiff
c7eee6fef0 add mtp responder to TWRP.
Big thanks to Dees_Troy for helping with the implementation.

Change-Id: I6c9c522b9c9de5dc139e2ecb0141008182ba07f0
2014-09-02 21:44:49 -04:00