54138462b4
Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87
...
am: efa40b4827
2017-06-09 01:03:02 +00:00
efa40b4827
Merge "Fix a race condition for temperature_logger"
...
am: 8e5fb46e87
2017-06-09 01:01:03 +00:00
8e5fb46e87
Merge "Fix a race condition for temperature_logger"
2017-06-09 00:56:39 +00:00
379571098d
Fix a race condition for temperature_logger
...
It's a rare deadlock that happens on fugu when the updater exits too
fast due to a format error.
Bug: 62379170
Test: fake-ota fails gracefully without hanging.
Change-Id: Icbd6cff4f6b44ca20f4d75f8039332111f696cc5
2017-06-08 12:10:30 -07:00
d1b65aa645
Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb
...
am: 66e53f59b9
2017-05-31 21:59:21 +00:00
66e53f59b9
Merge "kill package_extract_dir" am: 99e7216907
...
am: 49f9c969eb
2017-05-31 21:57:18 +00:00
49f9c969eb
Merge "kill package_extract_dir"
...
am: 99e7216907
2017-05-31 21:54:18 +00:00
99e7216907
Merge "kill package_extract_dir"
2017-05-31 21:49:03 +00:00
d38aec8de6
Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a
...
am: 4a2cfffd33
2017-05-26 23:20:07 +00:00
4a2cfffd33
Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af
...
am: 0f8e67088a
2017-05-26 23:15:36 +00:00
0f8e67088a
Merge "Implement a custom deflate sink function for bspatch"
...
am: 764eb215af
2017-05-26 23:13:36 +00:00
764eb215af
Merge "Implement a custom deflate sink function for bspatch"
2017-05-26 23:07:13 +00:00
a897f95bd5
Implement a custom deflate sink function for bspatch
...
This new sink function works as a wrapper of the old sink. It deflates
the available patch data on the fly. Therefore, we don't need to store
the full uncompressed patch data in memory.
Test: recovery_component_test && apply an incremental update on angler
Change-Id: I2274ec50a1607089abcc9d0954a2a748f28c3122
2017-05-26 14:05:20 -07:00
da1fcf7ab2
Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71
...
am: aef046255a
2017-05-24 18:54:04 +00:00
aef046255a
Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789
...
am: 66f02b4e71
2017-05-24 18:51:03 +00:00
66f02b4e71
Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails"
...
am: 9c1a114789
2017-05-24 18:48:04 +00:00
9c1a114789
Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails"
2017-05-24 18:42:02 +00:00
6957555e29
Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails
...
We have seen one case when bspatch failed likely due to patch
corruption. Since the package has passed verification before, we want
to reboot and retry the patch command again since there's no
alternative for users.
We won't delete the stash before reboot, and the src has passed SHA1
check. If there's an error on the patch, it will fail the package
verification during retry.
Bug: 37855643
Test: angler reboots and retries the update when bspatch fails.
Change-Id: I2ebac9621bd1f0649bb301b9a28a0dd079ed4e1d
2017-05-23 17:36:56 -07:00
53c38b1538
kill package_extract_dir
...
It's only used by file-based OTA which has been deprecated for O.
Test: mma
Change-Id: I439c93155ca94554d827142c99aa6c0845cc7561
2017-05-23 17:09:45 -07:00
0abe9860d8
Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d
...
am: 1562f41348
2017-05-18 22:20:55 +00:00
1562f41348
Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48
...
am: 8f68accc9d
2017-05-18 22:16:24 +00:00
8f68accc9d
Merge "Print SHA1 of the patch if bsdiff fails with data error"
...
am: 1f9808bd48
2017-05-18 22:11:54 +00:00
1f9808bd48
Merge "Print SHA1 of the patch if bsdiff fails with data error"
2017-05-18 22:02:03 +00:00
eefefc6c13
Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926
...
am: 01bcf118d5
2017-05-18 20:34:48 +00:00
01bcf118d5
Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94
...
am: 8226fd8926
2017-05-18 20:31:18 +00:00
8226fd8926
Merge "libbootloader_message: convert to Android.bp"
...
am: bec0d4cb94
2017-05-18 20:26:24 +00:00
bec0d4cb94
Merge "libbootloader_message: convert to Android.bp"
2017-05-18 20:18:00 +00:00
1c120067c2
Fix the input parameter for "set_retry_bootloader_message"
...
am: 539b08cfcf
2017-05-18 17:58:02 +00:00
1941f61fb6
Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 am: 1d6f88675b
...
am: f1546892e1
2017-05-17 20:20:00 +00:00
f1546892e1
Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76
...
am: 1d6f88675b
2017-05-17 20:17:29 +00:00
1d6f88675b
Merge "Fix the input parameter for "set_retry_bootloader_message""
...
am: 0e60ccdc76
2017-05-17 20:13:31 +00:00
0e60ccdc76
Merge "Fix the input parameter for "set_retry_bootloader_message""
2017-05-17 20:02:12 +00:00
539b08cfcf
Fix the input parameter for "set_retry_bootloader_message"
...
We're not updating argc & argv during get_args(), so some boot
arguments missed when we set the boot message for retry.
Bug: 38383406
Test: boot command sets correctly during retry attempt.
Change-Id: Ie8583a22fad5e0084245e3431d4018518d508dfd
(cherry picked from commit 72449c9f99
2017-05-17 11:52:17 -07:00
600e806384
libbootloader_message: convert to Android.bp
...
Test: build
Change-Id: Ia0c2e141673e37eea29306817d2f4b2c944213b0
2017-05-17 11:43:29 -07:00
72449c9f99
Fix the input parameter for "set_retry_bootloader_message"
...
We're not updating argc & argv during get_args(), so some boot
arguments missed when we set the boot message for retry.
Bug: 38383406
Test: boot command sets correctly during retry attempt.
Change-Id: Ie8583a22fad5e0084245e3431d4018518d508dfd
2017-05-17 18:09:35 +00:00
ce5fa5e538
Print SHA1 of the patch if bsdiff fails with data error
...
This will help us to identify the patch corruption.
Meanwhile fix a wrong size parameter passed to bspatch.
(patch->data.size() into patch->data.size() - patch_offset).
Also remove the only usage of "ApplyBSDiffPatchMem()" and inline its
Sink function for simplicity.
Bug: 37855643
Test: Prints SHA1 for corrupted patch in imgdiff_test.
Change-Id: Ibf2db8c08b0ded1409bb7c91a3547a6bf99c601d
2017-05-16 12:39:14 -07:00
763b52dd45
Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b am: 843ca31c4c
...
am: 9539cdb3c0
2017-05-12 21:56:48 +00:00
9539cdb3c0
Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b
...
am: 843ca31c4c
2017-05-12 21:51:17 +00:00
843ca31c4c
Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0."
...
am: 494d97fe6b
2017-05-12 21:45:47 +00:00
494d97fe6b
Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0."
2017-05-12 21:26:36 +00:00
397a8137a0
updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0.
...
Commit adeb41a8c0
2017-05-12 12:09:16 -07:00
7890e6e689
Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673 am: 7ca2e734fc
...
am: e89cbd675c
2017-05-12 01:55:03 +00:00
e89cbd675c
Merge "Don't write to /sys/class/android_usb/android0/enable with configfs." am: 7cb1b79673
...
am: 7ca2e734fc
2017-05-12 01:39:02 +00:00
7ca2e734fc
Merge "Don't write to /sys/class/android_usb/android0/enable with configfs."
...
am: 7cb1b79673
2017-05-12 01:35:55 +00:00
7cb1b79673
Merge "Don't write to /sys/class/android_usb/android0/enable with configfs."
2017-05-12 01:18:52 +00:00
0167d4c382
Don't write to /sys/class/android_usb/android0/enable with configfs.
...
USB configfs doesn't use /s/c/a/a/enable. Trying to set that gives
confusing message on screen when sideloading.
Bug: 37713851
Test: adb sideload on device using with configfs.
Test: adb sideload on marlin.
Change-Id: Ifa55f90c2a5fe6bf9e7cee95882de9f6de686d73
2017-05-11 14:50:20 -07:00
2d7c9797c6
Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed am: b0626221a1
...
am: 8c7c38ca7f
2017-05-11 04:44:46 +00:00
8c7c38ca7f
Merge "recovery: Skip "/" in setup_install_mounts()." am: d7446c8eed
...
am: b0626221a1
2017-05-11 04:39:12 +00:00
b0626221a1
Merge "recovery: Skip "/" in setup_install_mounts()."
...
am: d7446c8eed
2017-05-11 04:37:13 +00:00
d7446c8eed
Merge "recovery: Skip "/" in setup_install_mounts()."
2017-05-11 04:31:22 +00:00
Tianjie Xu
Tom Cherry
Tao Bao