d5097253f6
Merge "Avoid overwrite of the error message in AbortFn" am: bded087f7d am: 20af3722d8
...
am: 39b6c7fcfe
2018-01-30 22:13:23 +00:00
39b6c7fcfe
Merge "Avoid overwrite of the error message in AbortFn" am: bded087f7d
...
am: 20af3722d8
2018-01-30 22:02:50 +00:00
20af3722d8
Merge "Avoid overwrite of the error message in AbortFn"
...
am: bded087f7d
2018-01-30 21:51:11 +00:00
bded087f7d
Merge "Avoid overwrite of the error message in AbortFn"
2018-01-30 21:44:02 +00:00
5ad802839d
Avoid overwrite of the error message in AbortFn
...
The AbortFn() used to overwrite the error message, hiding the real
failure reported in ErrorAbort(). And we will miss the failure in
the script patterns like 'blockimageupdate() || abort()'
We will ensure there's one line break at the end of ErrorAbort's
error message; and append to the existing error message when calling
abort().
Test: Message from ErrorAbort shows up in the log
Change-Id: I3aebd06629c5129330250c7fe5e8cdead2ae85bc
2018-01-29 11:42:59 -08:00
50d24b9ce5
Merge "Add update_channel field to bootloader_message_ab." am: 63eb1a4444 am: 7441ee7aff
...
am: cbbf671919
2018-01-26 01:56:48 +00:00
cbbf671919
Merge "Add update_channel field to bootloader_message_ab." am: 63eb1a4444
...
am: 7441ee7aff
2018-01-26 01:00:05 +00:00
7441ee7aff
Merge "Add update_channel field to bootloader_message_ab."
...
am: 63eb1a4444
2018-01-26 00:58:01 +00:00
63eb1a4444
Merge "Add update_channel field to bootloader_message_ab."
2018-01-26 00:48:09 +00:00
7191bf0492
Add update_channel field to bootloader_message_ab.
...
The update_channel field is used to store the Omaha update channel
if update_engine is compiled with Omaha support.
We need it to be in misc to persist through factory reset.
Bug: 72332119
Test: mma
Change-Id: Ied4fecc6e78cc69d33a36ba4d101d675100f9d82
2018-01-22 15:03:53 -08:00
bd84bd438a
Statically link with libhealthstoragedefault
...
This is to add empty implementations of Health
HAL methods to report storage info.
Bug: 68388678
Test: vts-tradefed run vts -m VtsHalHealthV2_0
Change-Id: I4f093903f485519e16f39384f5c96fcd031438ba
2018-01-11 17:48:09 -08:00
77e8137720
Merge "StartsWith allows a std::string prefix now." am: 80ccac2fff am: bd870377b4
...
am: 92be1378f9
2017-12-21 14:48:53 +00:00
92be1378f9
Merge "StartsWith allows a std::string prefix now." am: 80ccac2fff
...
am: bd870377b4
2017-12-21 09:34:32 +00:00
bd870377b4
Merge "StartsWith allows a std::string prefix now."
...
am: 80ccac2fff
2017-12-21 06:14:28 +00:00
80ccac2fff
Merge "StartsWith allows a std::string prefix now."
2017-12-21 02:11:08 +00:00
1d65c95fe8
StartsWith allows a std::string prefix now.
...
Bug: N/A
Test: builds
Change-Id: I5183ec8133f5dc9a81a438223c6d3d2ea11ef0ec
2017-12-20 12:36:31 -08:00
c35b5c64a8
Merge "Let update_verifier work on non-AB update devices" am: 3fe230a1e4 am: 4b7ed5a71b
...
am: 50a4171030
2017-12-14 04:39:26 +00:00
50a4171030
Merge "Let update_verifier work on non-AB update devices" am: 3fe230a1e4
...
am: 4b7ed5a71b
2017-12-14 04:36:26 +00:00
4b7ed5a71b
Merge "Let update_verifier work on non-AB update devices"
...
am: 3fe230a1e4
2017-12-14 04:30:54 +00:00
3fe230a1e4
Merge "Let update_verifier work on non-AB update devices"
2017-12-14 04:18:41 +00:00
26fd78c024
Let update_verifier work on non-AB update devices
...
Make update_verifier check if it runs on A/B update devices at the
beginning, and quit immediately if it doesn't, instead of re-boot.
Bug: 70541023
Test: On aosp/master:
$ lunch aosp_x86_64-userdebug; m -j # boot to home screen
# On goog/master:
$ lunch aosp_walleye-userdebug; m -j # boot to home screen
Change-Id: Ib71a3a3b272cfa5dd0b479eaa067eedaec8fde7d
2017-12-14 10:20:07 +08:00
7153b24dd7
Merge "applypatch: Remove the 'st' field from FileContents." am: 9203e77e7d am: 710712f235
...
am: a002abfacf
2017-12-09 17:39:05 +00:00
a002abfacf
Merge "applypatch: Remove the 'st' field from FileContents." am: 9203e77e7d
...
am: 710712f235
2017-12-09 17:36:05 +00:00
710712f235
Merge "applypatch: Remove the 'st' field from FileContents."
...
am: 9203e77e7d
2017-12-09 17:33:01 +00:00
9203e77e7d
Merge "applypatch: Remove the 'st' field from FileContents."
2017-12-09 17:27:39 +00:00
a296fea692
Merge "add sload.f2fs for recovery format" am: 4eaf7a157d am: 3d4359d3ae
...
am: adb8f660a2
2017-12-08 17:00:50 +00:00
adb8f660a2
Merge "add sload.f2fs for recovery format" am: 4eaf7a157d
...
am: 3d4359d3ae
2017-12-08 01:13:13 +00:00
3d4359d3ae
Merge "add sload.f2fs for recovery format"
...
am: 4eaf7a157d
2017-12-08 01:07:11 +00:00
38b4f74b5d
Merge "Add a /bin symlink for consistency." am: ed369101ba am: 13b751ed84
...
am: 669f9b0cbf
2017-12-08 00:58:01 +00:00
4eaf7a157d
Merge "add sload.f2fs for recovery format"
2017-12-08 00:57:41 +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
47e5a8d085
applypatch: Remove the 'st' field from FileContents.
...
It used to keep track of the stat(2) info (e.g. st_mode/st_gid/st_uid)
while patching a file in file-based OTA.
Test: Build and use the new updater to apply an update on bullhead.
Change-Id: Ibf8f0f4b14298a9489bf24a2678bb279c5d9c8f3
2017-12-07 10:01:57 -08: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
c1c7311b8a
add sload.f2fs for recovery format
...
Change-Id: Iddfe54b2b36f2d531925cbe61c98dbfb4903c0d1
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com >
2017-12-04 20:27:49 -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
Tianjie Xu
Sen Jiang
Hridya Valsaraju
Elliott Hughes
Treehugger Robot
Isaac Chen
Tao Bao
Jaegeuk Kim
Yifan Hong
Jin Qian