38b4f74b5d
Merge "Add a /bin symlink for consistency." am: ed369101ba am: 13b751ed84
...
am: 669f9b0cbf
2017-12-08 00:58:01 +00:00
669f9b0cbf
Merge "Add a /bin symlink for consistency." am: ed369101ba
...
am: 13b751ed84
2017-12-07 18:49:47 +00:00
13b751ed84
Merge "Add a /bin symlink for consistency."
...
am: ed369101ba
2017-12-07 18:38:10 +00:00
ed369101ba
Merge "Add a /bin symlink for consistency."
2017-12-07 16:55:25 +00:00
4dca6f12db
Add a /bin symlink for consistency.
...
Bug: http://b/63142920
Test: builds
Change-Id: I1f96935daca4d79f753e172067e07f8e27ea819e
2017-12-06 08:41:50 -08:00
1ab7bf47a6
Merge "Detect interrupted update due to power off" am: d8fadfb606 am: d9caba2bbe
...
am: db20e41b0c
2017-12-01 03:02:14 +00:00
db20e41b0c
Merge "Detect interrupted update due to power off" am: d8fadfb606
...
am: d9caba2bbe
2017-12-01 03:00:12 +00:00
d9caba2bbe
Merge "Detect interrupted update due to power off"
...
am: d8fadfb606
2017-12-01 02:58:41 +00:00
d8fadfb606
Merge "Detect interrupted update due to power off"
2017-12-01 02:52:23 +00:00
99b73be3a8
Detect interrupted update due to power off
...
An interrupted update may stash extra blocks in /cache, leading to a
failure when checking the cache size. We can save the incremented
retry_count in the BCB before installing the update; and distinguish
a fresh update from an interrupted one this way.
Bug: 68679601
Test: An interrupted update reapplies successfully.
Change-Id: Ic1403e1fd25a937c91ef34c14b92a0f6c8f1c0f4
2017-11-30 16:25:47 -08:00
debdd1732c
Merge "is_battery_ok use health 2.0 HAL"
2017-11-20 22:52:05 +00:00
86104180a0
Merge "root: Fix an issue when volume length from fs_mgr is negative." am: 5ce9fe355c am: 25e27f48db
...
am: 7a1abb9279
2017-11-20 18:57:20 +00:00
7a1abb9279
Merge "root: Fix an issue when volume length from fs_mgr is negative." am: 5ce9fe355c
...
am: 25e27f48db
2017-11-20 18:54:48 +00:00
25e27f48db
Merge "root: Fix an issue when volume length from fs_mgr is negative."
...
am: 5ce9fe355c
2017-11-20 18:52:48 +00:00
5ce9fe355c
Merge "root: Fix an issue when volume length from fs_mgr is negative."
2017-11-20 18:47:56 +00:00
cc10008887
root: Fix an issue when volume length from fs_mgr is negative.
...
fs_mgr passes negative length as offset for crypt_footer. We need
to compute the actual device size for this case in addition to
when length is zero.
Bug: 68949069
Change-Id: I803955dd9591ad7752cee0dea9b683be8f4fd4ba
2017-11-18 21:54:44 -08:00
0a0b6a9fe1
Merge "Add libbrotli as a dependency when building applypatch binary" am: c7069cc922 am: 086202e30d
...
am: 2a8e4095cb
2017-11-17 16:18:17 +00:00
2a8e4095cb
Merge "Add libbrotli as a dependency when building applypatch binary" am: c7069cc922
...
am: 086202e30d
2017-11-17 16:15:43 +00:00
086202e30d
Merge "Add libbrotli as a dependency when building applypatch binary"
...
am: c7069cc922
2017-11-17 16:13:13 +00:00
c7069cc922
Merge "Add libbrotli as a dependency when building applypatch binary"
2017-11-17 16:09:08 +00:00
bb436b397a
Merge "Switch imgdiff to libbase logging" am: fd9c25e636 am: 47c8c290ec
...
am: 365c98fd1d
2017-11-17 06:00:12 +00:00
365c98fd1d
Merge "Switch imgdiff to libbase logging" am: fd9c25e636
...
am: 47c8c290ec
2017-11-17 05:58:10 +00:00
47c8c290ec
Merge "Switch imgdiff to libbase logging"
...
am: fd9c25e636
2017-11-17 05:56:10 +00:00
fd9c25e636
Merge "Switch imgdiff to libbase logging"
2017-11-17 05:53:58 +00:00
6e293c99c1
Switch imgdiff to libbase logging
...
Also add a verbose option. And we won't print messages of 'info'
severity unless '-v' is present.
Test: run imgdiff and check the logs.
Change-Id: I1b90874baea8e72e2a2323a0b63bc5d35e653e6b
2017-11-15 22:35:39 -08:00
8e376e01e7
Merge "minadbd: Remove two warning options." am: 7bd61f0cc0 am: 345f350540
...
am: 97a4750098
2017-11-15 23:07:38 +00:00
97a4750098
Merge "minadbd: Remove two warning options." am: 7bd61f0cc0
...
am: 345f350540
2017-11-15 23:06:11 +00:00
345f350540
Merge "minadbd: Remove two warning options."
...
am: 7bd61f0cc0
2017-11-15 23:04:09 +00:00
7bd61f0cc0
Merge "minadbd: Remove two warning options."
2017-11-15 22:59:40 +00:00
f87d20404d
minadbd: Remove two warning options.
...
'-Wimplicit-function-declaration' is not needed (it's for C89) and
already enabled by -Wall.
For '-Wno-missing-field-initializers', don't see any existing case that
requires the flag.
Test: `mmma -j bootable/recovery` on aosp_{bullhead,marlin}-userdebug.
Change-Id: I46604723087ed9a7747f6cae31a95fc0074c6758
2017-11-15 11:34:26 -08:00
e8e4c40246
is_battery_ok use health 2.0 HAL
...
Test: call is_battery_ok in graphics test, and test manually
Bug: 69268160
Bug: 63702641
Change-Id: Ifcf4d2e2cb459689c11fc5d1b880bb053aaae8ae
2017-11-14 11:29:53 -08:00
60ee026849
Merge "recovery: format f2fs with encrypt/quota" am: d4b6e25fdd am: c418bfeae2
...
am: e9e7fcf327
2017-11-14 03:22:31 +00:00
e9e7fcf327
Merge "recovery: format f2fs with encrypt/quota" am: d4b6e25fdd
...
am: c418bfeae2
2017-11-14 03:01:01 +00:00
c418bfeae2
Merge "recovery: format f2fs with encrypt/quota"
...
am: d4b6e25fdd
2017-11-14 02:45:25 +00:00
d4b6e25fdd
Merge "recovery: format f2fs with encrypt/quota"
2017-11-14 01:49:26 +00:00
1a8bb0f542
recovery: format f2fs with encrypt/quota
...
Change-Id: Ia393b7b78b45f09964449ec0e255aa26bb3b8ddf
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com >
2017-11-13 14:05:00 -08:00
d70f5d924b
Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." am: de07371b03 am: e2296b7a25
...
am: efcd98da32
2017-11-11 01:22:35 +00:00
efcd98da32
Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch." am: de07371b03
...
am: e2296b7a25
2017-11-11 01:20:04 +00:00
e2296b7a25
Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch."
...
am: de07371b03
2017-11-11 01:18:04 +00:00
de07371b03
Merge "applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch."
2017-11-11 01:09:47 +00:00
1e0941f4f6
applypatch: Change the patch parameter to const Value& in Apply{BSDiff,Image}Patch.
...
It used to be "const Value*", but nullptr won't be a valid input.
Test: recovery_host_test; recovery_component_test
Change-Id: I904b5689ac3e64504088bf0544c9fb5d45a52243
2017-11-10 12:18:34 -08:00
2c6b53899d
Merge "Include bspatch.h from bsdiff/" am: 29cd3215ec am: e73bca40dc
...
am: 0347049768
2017-11-10 10:01:05 +00:00
0347049768
Merge "Include bspatch.h from bsdiff/" am: 29cd3215ec
...
am: e73bca40dc
2017-11-10 09:59:04 +00:00
e73bca40dc
Merge "Include bspatch.h from bsdiff/"
...
am: 29cd3215ec
2017-11-10 09:57:04 +00:00
29cd3215ec
Merge "Include bspatch.h from bsdiff/"
2017-11-10 09:54:11 +00:00
198db195af
Merge "uncrypt: Move to Soong." am: 992bccfef4 am: e6250057b8
...
am: ff0143d09e
2017-11-09 23:50:52 +00:00
ff0143d09e
Merge "uncrypt: Move to Soong." am: 992bccfef4
...
am: e6250057b8
2017-11-09 23:31:50 +00:00
e6250057b8
Merge "uncrypt: Move to Soong."
...
am: 992bccfef4
2017-11-09 23:29:04 +00:00
992bccfef4
Merge "uncrypt: Move to Soong."
2017-11-09 23:09:33 +00:00
9715398c4b
Merge "Load-balancing update_verifier worker threads." am: f1e70b93f1 am: 1d8cb3659a
...
am: c5df267599
2017-11-09 22:00:36 +00:00
Elliott Hughes
Tianjie Xu
Treehugger Robot
Yifan Hong
Jin Qian
Tao Bao
Jaegeuk Kim
Alex Deymo