a7e7cef949
Merge "edify: accept long string literal." am: d379b4410b
...
am: bb0e2754ac
2016-01-27 23:25:44 +00:00
bb0e2754ac
Merge "edify: accept long string literal."
...
am: d379b4410b
2016-01-27 23:23:53 +00:00
d379b4410b
Merge "edify: accept long string literal."
2016-01-27 23:05:57 +00:00
12f499e86d
edify: accept long string literal.
...
Bug: 24717917
Change-Id: I134cf00ae7efbc3703f976459a1b9f9a197e495d
2016-01-27 12:26:18 -08:00
59f2815145
Merge "Change BCB to perform synchronous writes." am: 5797bf9c90
...
am: e51d0b4d38
2016-01-22 18:46:07 +00:00
e51d0b4d38
Merge "Change BCB to perform synchronous writes."
...
am: 5797bf9c90
2016-01-22 17:27:38 +00:00
5797bf9c90
Merge "Change BCB to perform synchronous writes."
2016-01-22 17:23:17 +00:00
bd82b27341
Change BCB to perform synchronous writes.
...
Also some trivial clean-ups in bootloader control block (BCB) code.
Change-Id: I42828954caa4d08998310de40fd0391f76d99cbe
2016-01-21 14:49:13 -08:00
b595e1722c
Merge "recovery: Fork a process for fuse when sideloading from SD card." am: 37e3c71da3
...
am: ce46828e08
2016-01-14 20:19:31 +00:00
ce46828e08
Merge "recovery: Fork a process for fuse when sideloading from SD card."
...
am: 37e3c71da3
2016-01-14 18:29:05 +00:00
37e3c71da3
Merge "recovery: Fork a process for fuse when sideloading from SD card."
2016-01-14 18:25:54 +00:00
cdcf28f54f
recovery: Fork a process for fuse when sideloading from SD card.
...
For applying update from SD card, we used to use a thread to serve the
file with fuse. Since accessing through fuse involves going from kernel
to userspace to kernel, it may run into deadlock (e.g. for mmap_sem)
when a page fault occurs. Switch to using a process instead.
Bug: 23783099
Bug: 26313124
Change-Id: Iac0f55b1bdb078cadb520cfe1133e70fbb26eadd
2016-01-13 21:29:20 -08:00
811353ab0f
Merge "uncrypt: avoid use-after-free" am: 0305fcecc5
...
am: 4edfeb84dd
2016-01-14 02:09:00 +00:00
4edfeb84dd
Merge "uncrypt: avoid use-after-free"
...
am: 0305fcecc5
2016-01-14 02:05:31 +00:00
0305fcecc5
Merge "uncrypt: avoid use-after-free"
2016-01-14 00:41:04 +00:00
0a8762e50c
Revert "Byte swap to support BGRA in recovery mode" am: a5d5082222 am: 40cce13094
...
am: 2d127a1d4a
2016-01-13 18:50:21 +00:00
fcf142be17
Merge "Rename .l/.y to .ll/.yy" am: ab9db5284e
...
am: f607e5a0bc
2016-01-13 18:45:22 +00:00
c577660702
Rename .l/.y to .ll/.yy
...
Now to generate .cpp you need to use .ll/.yy.
Bug: 26492989
Change-Id: Ib078e03b3b0758f7a62595c343e52ae856bcb33f
2016-01-12 21:09:10 -08:00
c5631fc096
uncrypt: avoid use-after-free
...
The `std::string package` variable goes out of scope but the input_path
variable is then used to access the memory as it's set to `c_str()`.
This was detected via OpenBSD malloc's junk filling feature.
Change-Id: Ic4b939347881b6ebebf71884e7e2272ce99510e2
2016-01-12 14:08:34 -08:00
2d127a1d4a
Revert "Byte swap to support BGRA in recovery mode" am: a5d5082222
...
am: 40cce13094
2016-01-12 20:42:52 +00:00
40cce13094
Revert "Byte swap to support BGRA in recovery mode"
...
am: a5d5082222
2016-01-12 19:16:25 +00:00
f607e5a0bc
Merge "Rename .l/.y to .ll/.yy"
...
am: ab9db5284e
2016-01-12 18:57:20 +00:00
ab9db5284e
Merge "Rename .l/.y to .ll/.yy"
2016-01-12 17:35:33 +00:00
c8abc4ec45
Rename .l/.y to .ll/.yy
...
Now to generate .cpp you need to use .ll/.yy.
Bug: 26492989
Change-Id: Ib078e03b3b0758f7a62595c343e52ae856bcb33f
2016-01-11 18:14:17 -08:00
b1cc5d8434
Merge "IO fault injection for OTA packages"
2016-01-08 23:28:32 +00:00
a5d5082222
Revert "Byte swap to support BGRA in recovery mode"
...
This reverts commit e5879c3639fd778e3e40
2016-01-08 10:15:57 -08:00
cb93b61578
Merge "updater: Add a function to check first block" am: 6f8b9b60db
...
am: a3c89623e7
2016-01-08 00:30:45 +00:00
a3c89623e7
Merge "updater: Add a function to check first block"
...
am: 6f8b9b60db
2016-01-08 00:28:42 +00:00
6f8b9b60db
Merge "updater: Add a function to check first block"
2016-01-08 00:23:50 +00:00
57bed6d8c9
updater: Add a function to check first block
...
Add and register a function to check if the device has been remounted
since last update during incremental OTA. This function reads block 0
and executes before partition recovery for version >= 4.
Bug: 21124327
Change-Id: I8b915b9f1d4736b3609daa9d16bd123225be357f
(cherry picked from commit 30bf476559
2016-01-07 11:19:48 -08:00
c94a4f5371
Merge "updater: Add a function to check first block"
2016-01-07 01:33:13 +00:00
f1fc48c6e6
IO fault injection for OTA packages
...
Bug: 25951086
Change-Id: I31c74c735eb7a975b7f41fe2b2eff042e5699c0c
2016-01-06 12:23:42 -08:00
085fc1361f
Merge "imgdiff: skip spurious gzip headers in image files" am: 8e150a5b24
...
am: c1de9837e3
2016-01-04 18:07:54 +00:00
c1de9837e3
Merge "imgdiff: skip spurious gzip headers in image files"
...
am: 8e150a5b24
2016-01-04 18:05:34 +00:00
8e150a5b24
Merge "imgdiff: skip spurious gzip headers in image files"
2016-01-04 18:02:04 +00:00
0779fc9814
imgdiff: skip spurious gzip headers in image files
...
dragon kernel is compressed via lz4 for boot speed and bootloader
support reasons and recent prebuilts happen to include the gzip header
sequence which is causing imgdiff to fail.
Detect a spurious gzip header and treat the section as a normal section.
Bug: 26133184
Change-Id: I369d7d576fd7d2c579c0780fc5c669a5b6ea0d3d
(cherry picked from commit 0f2f6a746af517afca9e5e089a4a17be0a9766d6)
Signed-off-by: David Riley <davidriley@google.com >
2015-12-23 09:43:59 -08:00
2538b952b8
Merge "res: Embed FPS into icon_installing.png." am: 29b0fbe160
...
am: ef911716b0
2015-12-18 22:32:36 +00:00
ef911716b0
Merge "res: Embed FPS into icon_installing.png."
...
am: 29b0fbe160
2015-12-18 22:30:28 +00:00
29b0fbe160
Merge "res: Embed FPS into icon_installing.png."
2015-12-18 22:20:20 +00:00
30bf476559
updater: Add a function to check first block
...
Add and register a function to check if the device has been remounted
since last update during incremental OTA. This function reads block 0
and executes before partition recovery for version >= 4.
Bug: 21124327
Change-Id: I8b915b9f1d4736b3609daa9d16bd123225be357f
2015-12-18 13:35:35 -08:00
b723f4f38f
res: Embed FPS into icon_installing.png.
...
We allow vendor-specific icon installing image but have defined private
animation_fps that can't be overridden. This CL changes the image
generator to optionally embed FPS (otherwise use the default value of
20) into the generated image.
For wear devices, they are using individual images instead of the
interlaced one. Change the animation_fps from private to protected so
that it can be customized.
Bug: 26009230
Change-Id: I9fbf64ec717029d4c54f72316f6cb079e8dbfb5e
2015-12-16 11:35:52 -08:00
afd85ecad2
Merge "updater: Use O_SYNC and fsync() for package_extract_file()." am: 4e72d1a81e
...
am: 125a6349b9
2015-12-15 18:32:33 +00:00
125a6349b9
Merge "updater: Use O_SYNC and fsync() for package_extract_file()."
...
am: 4e72d1a81e
2015-12-15 18:23:53 +00:00
4e72d1a81e
Merge "updater: Use O_SYNC and fsync() for package_extract_file()."
2015-12-15 17:55:05 +00:00
d3cac34430
updater: Use O_SYNC and fsync() for package_extract_file().
...
We are already using O_SYNC and fsync() for the recursive case
(package_extract_dir()). Make it consistent for the single-file case.
Bug: 20625549
Change-Id: I487736fe5a0647dd4a2428845e76bf642e0f0dff
2015-12-14 17:13:34 -08:00
3af5e554af
Merge "update_verifier: Track the API change for isSlotBootable()." am: e062645efa
...
am: 1a76924301
2015-12-10 21:02:56 -08:00
5ac61d7a9e
Merge "uncrypt: Suppress the compiler warnings on LP64." am: ca18526760
...
am: 8fa5f006c1
2015-12-10 21:02:52 -08:00
9c4fbbcde7
Merge "updater: Output msg when recovery is called" am: 32f6298742
...
am: 3e67970c2c
2015-12-10 21:02:47 -08:00
1a76924301
Merge "update_verifier: Track the API change for isSlotBootable()."
...
am: e062645efa
2015-12-10 21:00:17 -08:00
e062645efa
Merge "update_verifier: Track the API change for isSlotBootable()."
2015-12-11 04:53:48 +00:00
Yabin Cui
Tao Bao
Andriy Naborskyy
Ying Wang
Ying Wang
Daniel Micay
Jed Estep
Tianjie Xu
David Riley