The Android Automerger
1986e9e6aa
merge in lmp-release history after reset to a6e13ae01b
2014-09-29 06:11:31 -07:00
The Android Automerger
c8ff5bc699
merge in lmp-mr1-release history after reset to d83e4f1589
2014-09-29 06:09:52 -07:00
The Android Automerger
8e76df9660
merge in lmp-release history after reset to a6e13ae01b
2014-09-28 06:10:04 -07:00
The Android Automerger
acfc400adb
merge in lmp-mr1-release history after reset to d83e4f1589
2014-09-28 06:08:55 -07:00
The Android Automerger
0e212f7671
merge in lmp-mr1-release history after reset to d83e4f1589
2014-09-27 06:09:14 -07:00
Dan Albert
b94b25bce9
am 93ecb938: am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""
...
* commit '93ecb9383a22c6828c9b332b7d1089ff97319999':
Revert "Copy epoll(2) changes to minadb."
2014-09-26 19:39:37 +00:00
Dan Albert
93ecb9383a
am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""
...
* commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0':
Revert "Copy epoll(2) changes to minadb."
2014-09-26 16:12:34 +00:00
Dan Albert
ea5828a24f
am 28ffde5e: Merge "Revert "Copy epoll(2) changes to minadb.""
...
* commit '28ffde5ebd33d5b693906a93087e6eea627cd8d0':
Revert "Copy epoll(2) changes to minadb."
2014-09-26 16:12:23 +00:00
Dan Albert
28ffde5ebd
Merge "Revert "Copy epoll(2) changes to minadb.""
2014-09-26 16:04:16 +00:00
Doug Zongker
7a054ec9a7
am 91c27888: am d83e4f15: support for version 2 of block image diffs
...
* commit '91c27888517c514d1da8cbcd76fdc4b437d193f8':
support for version 2 of block image diffs
2014-09-26 15:39:46 +00:00
Doug Zongker
91c2788851
am d83e4f15: support for version 2 of block image diffs
...
* commit 'd83e4f15890ac6ebe0d61924bd224eb1ae8565ad':
support for version 2 of block image diffs
2014-09-26 14:54:01 +00:00
Doug Zongker
d83e4f1589
support for version 2 of block image diffs
...
In version 2 of block image diffs, we support a new command to load
data from the image and store it in the "stash table" and then
subsequently use entries in the stash table to fill in missing bits of
source data we're not allowed to read when doing move/bsdiff/imgdiff
commands.
This leads to smaller update packages because we can break cycles in
the ordering of how pieces are updated by storing data away and using
it later, rather than not using the data as input to the patch system
at all. This comes at the cost of the RAM or scratch disk needed to
store the data.
The implementation is backwards compatible; it can still handle the
existing version 1 of the transfer file format.
Change-Id: I4559bfd76d5403859637aeac832f3a5e9e13b63a
2014-09-25 16:38:14 -07:00
Dan Albert
f420f8eb63
Revert "Copy epoll(2) changes to minadb."
...
This reverts commit db8c959049 .
2014-09-25 15:12:19 -07:00
Jeff Sharkey
79174dd192
am 62656652: am a6e13ae0: Include reason when wiping data.
...
* commit '6265665282a913a545606f4e8a20de8c57c3ae84':
Include reason when wiping data.
2014-09-25 17:19:11 +00:00
Jeff Sharkey
6265665282
am a6e13ae0: Include reason when wiping data.
...
* commit 'a6e13ae01bff5109361868f565187f16d045c82d':
Include reason when wiping data.
2014-09-25 17:06:24 +00:00
The Android Automerger
c855022536
merge in lmp-release history after reset to a6e13ae01b
2014-09-25 06:11:55 -07:00
The Android Automerger
25bbde071b
merge in lmp-mr1-release history after reset to 574443d895
2014-09-25 06:09:39 -07:00
Jeff Sharkey
e95ed95f05
am a6e13ae0: Include reason when wiping data.
...
* commit 'a6e13ae01bff5109361868f565187f16d045c82d':
Include reason when wiping data.
2014-09-24 23:35:38 +00:00
Jeff Sharkey
a6e13ae01b
Include reason when wiping data.
...
This will help us track down who requested a data wipe.
Bug: 17412160
Change-Id: I1c439fbd29f96b9851810baca9101f683a0f18d8
2014-09-24 11:46:17 -07:00
The Android Automerger
96e3b4f2af
merge in lmp-release history after reset to 574443d895
2014-09-24 06:10:53 -07:00
The Android Automerger
f55264dace
merge in lmp-mr1-release history after reset to 574443d895
2014-09-24 06:09:56 -07:00
The Android Automerger
d0acb96eab
merge in lmp-mr1-release history after reset to 574443d895
2014-09-23 15:13:52 -07:00
Elliott Hughes
632bf8668a
am 970c3947: am 530b61e0: Merge "Copy epoll(2) changes to minadb."
...
* commit '970c3947f39e8c880dd9f32002f9c7a9cdc96d54':
Copy epoll(2) changes to minadb.
2014-09-23 20:56:38 +00:00
Elliott Hughes
970c3947f3
am 530b61e0: Merge "Copy epoll(2) changes to minadb."
...
* commit '530b61e0b5f154e5f38853c10a28e0ea6f41c2ca':
Copy epoll(2) changes to minadb.
2014-09-23 18:57:44 +00:00
Elliott Hughes
78a3027860
am 530b61e0: Merge "Copy epoll(2) changes to minadb."
...
* commit '530b61e0b5f154e5f38853c10a28e0ea6f41c2ca':
Copy epoll(2) changes to minadb.
2014-09-23 18:57:39 +00:00
Elliott Hughes
530b61e0b5
Merge "Copy epoll(2) changes to minadb."
2014-09-23 18:36:34 +00:00
Elliott Hughes
db8c959049
Copy epoll(2) changes to minadb.
...
Bug: 17588403
Change-Id: Ib3525824ff09330bd9d6f9e96d662e5a55a20ec2
2014-09-23 10:50:55 -07:00
The Android Automerger
98faabce41
merge in lmp-release history after reset to 574443d895
2014-09-23 06:10:54 -07:00
The Android Automerger
f85e0ddf03
merge in lmp-mr1-release history after reset to 574443d895
2014-09-23 04:45:30 -07:00
The Android Automerger
ca58d2c010
merge in lmp-mr1-release history after reset to 574443d895
2014-09-22 11:44:31 -07:00
The Android Automerger
b79f5f8aed
merge in lmp-mr1-release history after reset to 574443d895
2014-09-22 11:13:43 -07:00
The Android Automerger
136c97c93b
merge in lmp-mr1-release history after reset to 574443d895
2014-09-22 10:17:01 -07:00
The Android Automerger
8e54f2fad8
merge in lmp-release history after reset to 574443d895
2014-09-22 06:10:07 -07:00
The Android Automerger
07159ef96d
merge in lmp-release history after reset to 574443d895
2014-09-21 06:09:23 -07:00
The Android Automerger
9e7c34c4bd
merge in lmp-release history after reset to 6241a16695
2014-09-20 21:00:37 -07:00
The Android Automerger
becf1e799b
merge in lmp-release history after reset to 574443d895
2014-09-20 06:09:47 -07:00
Ethan Yonker
6277c79727
Attempt to automatically identify data/media devices
...
Change-Id: Ia3007fbced9ce3bc94efdb3dacc582a5e68a49a4
2014-09-19 22:34:09 -05:00
The Android Automerger
6241a16695
merge in lmp-release history after reset to 574443d895
2014-09-18 06:09:14 -07:00
Christopher Ferris
1d30c2fe19
Use the correct fuse_init_out structure size.
...
Kernel 2.6.16 is the first stable kernel with struct fuse_init_out
defined (fuse version 7.6). The structure is the same from 7.6 through
7.22. Beginning with 7.23, the structure increased in size and added
new parameters.
If the kernel only works on minor revs older than or equal to 22,
then use the older structure size since this code only uses the 7.22
version of the structure.
Change-Id: I00d7530e01e6b4718dcd04ad2484959d12ef4a65
2014-09-17 17:10:41 -07:00
The Android Automerger
7facb691ed
merge in lmp-release history after reset to 574443d895
2014-09-17 06:09:58 -07:00
The Android Automerger
4954d8a1fd
merge in lmp-release history after reset to 574443d895
2014-09-16 06:09:54 -07:00
Ethan Yonker
1eff6cd5d1
Additional checks to prevent partitioning internal storage
...
Change-Id: I9fcd7e0169fbdd52405c0c86aafbef091f69411e
2014-09-15 13:30:42 -05:00
The Android Automerger
a160ad7ef6
merge in lmp-release history after reset to 574443d895
2014-09-15 06:09:48 -07:00
The Android Automerger
4cd02aeaeb
merge in lmp-release history after reset to 574443d895
2014-09-14 06:09:36 -07:00
The Android Automerger
c02b9ef11f
merge in lmp-release history after reset to 5e238a9971
2014-09-13 08:42:01 -07:00
The Android Automerger
9bcc1875c0
merge in lmp-release history after reset to 574443d895
2014-09-13 06:09:54 -07: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
The Android Automerger
5e238a9971
merge in lmp-release history after reset to 574443d895
2014-09-11 06:09:10 -07:00