Tao Bao
cd3c8c4eac
am b739a32b: Merge "recovery: Add timestamps in update logs."
...
* commit 'b739a32b7c32279da4d5ac55601f06bc5c81f1d5':
recovery: Add timestamps in update logs.
2015-09-18 04:03:50 +00:00
Tao Bao
b739a32b7c
Merge "recovery: Add timestamps in update logs."
2015-09-18 03:55:50 +00:00
Tao Bao
04ca426362
recovery: Add timestamps in update logs.
...
Fork a logger process and send over the log lines through a pipe.
Prepend a timestamp to each line for debugging purpose. Timestamps are
relative to the start of the logger.
Example lines with the change in this CL:
[ 445.948393] Verifying update package...
[ 446.279139] I:comment is 1738 bytes; signature 1720 bytes from end
[ 449.463652] I:whole-file signature verified against RSA key 0
[ 449.463704] I:verify_file returned 0
Change-Id: I139d02ed8f2e944c1618c91d5cc43282efd50b99
2015-09-17 10:57:31 -07:00
Tao Bao
f66e08a2a0
am a42a322d: Merge "updater: Manage buffers with std::vector."
...
* commit 'a42a322d8f6de0157625b518d12d1919f1e0dd7e':
updater: Manage buffers with std::vector.
2015-09-16 21:01:19 +00:00
Tao Bao
a42a322d8f
Merge "updater: Manage buffers with std::vector."
2015-09-16 19:12:14 +00:00
David Pursell
49a49e4f06
am ee17242f: Merge "minadbd: update service_to_fd() signature."
...
* commit 'ee17242f904730c759272b2576aafc59d764525b':
minadbd: update service_to_fd() signature.
2015-09-14 18:49:41 +00:00
David Pursell
ee17242f90
Merge "minadbd: update service_to_fd() signature."
2015-09-14 18:39:37 +00:00
Tao Bao
605241984c
am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."
...
* commit 'b83fd518262853d42b5a73a61ec6fdfafe0f5564':
recovery: Remove redirect_stdio() when calling ShowFile().
2015-09-12 01:15:45 +00:00
Tao Bao
b83fd51826
Merge "recovery: Remove redirect_stdio() when calling ShowFile()."
2015-09-12 01:09:49 +00:00
Tao Bao
9a7fd80d2d
recovery: Remove redirect_stdio() when calling ShowFile().
...
When calling ScreenRecoveryUI::ShowFile(), the only thing that gets
inadequately logged is the progress bar. Replace the call to
ScreenRecoveryUI::Print() with ScreenRecoveryUI::PrintOnScreenOnly() for
the progress bar, so we can avoid calling redirect_stdio().
Change-Id: I4d7c5d5b39bebe0d5880a99d7a72cee4f0b8f325
2015-09-10 13:42:05 -07:00
Tao Bao
0cf19d9ba1
am 7a677807: Merge "updater: Fix the line breaks in ui_print commands."
...
* commit '7a6778078b2525c245869061366eb1f92942542a':
updater: Fix the line breaks in ui_print commands.
2015-09-10 17:31:11 +00:00
Tao Bao
7a6778078b
Merge "updater: Fix the line breaks in ui_print commands."
2015-09-10 17:23:26 +00:00
Tao Bao
1107d96746
updater: Fix the line breaks in ui_print commands.
...
When processing ui_print commands in the updater, it misses a line break
when printing to the recovery log.
Also clean up uiPrintf() and UIPrintFn() with std::string's.
Change-Id: Ie5dbbfbc40b024929887d3c3ccd3a334249a8c9d
2015-09-10 10:17:56 -07:00
Tao Bao
612336ddc1
updater: Manage buffers with std::vector.
...
Change-Id: Ide489e18dd8daf161b612f65b28921b61cdd8d8d
2015-09-09 17:44:23 -07:00
Tao Bao
50828f58ca
am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."
...
* commit 'e520f1d4cddeca4208ccc385313d900581ff117c':
updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
2015-09-09 18:02:21 +00:00
Tao Bao
e520f1d4cd
Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."
2015-09-09 17:54:40 +00:00
Tao Bao
34847b2c70
updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
...
And inline the call to LoadSrcTgtVersion1() into SaveStash().
Change-Id: Ibf4ef2bfa2cc62df59c4e8de99fd7d8039e71ecf
2015-09-08 11:08:00 -07:00
Tao Bao
e5571a0ff8
am 585a50ce: Merge "imgdiff: fix file descriptor leak"
...
* commit '585a50cecbccf59666dd65e9fc4320eaa3511634':
imgdiff: fix file descriptor leak
2015-09-08 17:46:31 +00:00
Tao Bao
585a50cecb
Merge "imgdiff: fix file descriptor leak"
2015-09-08 17:40:27 +00:00
Jeremy Compostella
a91c66d7c1
imgdiff: fix file descriptor leak
...
mkstemp() allocates a file description that is never released. If
MakePatch() is called too many time, imgdiff reaches the Operating
System EMFILE (too many open files) limit.
Change-Id: Icbe1399f6f6d32cfa1830f879cacf7d75bbd9fc3
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com >
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com >
2015-09-08 19:15:09 +02:00
Tom Cherry
cf11a16015
am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc"
...
* commit 'f8c303f9c197ed9247dbc88a5bf392f1f2c65639':
move uncrypt from init.rc to uncrypt.rc
2015-09-04 17:56:28 +00:00
Tom Cherry
f8c303f9c1
Merge "move uncrypt from init.rc to uncrypt.rc"
2015-09-04 16:51:30 +00:00
David Pursell
c3d4d53546
minadbd: update service_to_fd() signature.
...
No functional change, just matching the signature to an adb change. See
https://android-review.googlesource.com/#/c/169601/ .
Change-Id: Ic826864e126054849b3a4d193ded8acc5ee5269c
2015-09-03 16:41:42 -07:00
Tom Cherry
daa6d04434
move uncrypt from init.rc to uncrypt.rc
...
Move uncrypt from /init.rc to /system/etc/init/uncrypt.rc using the
LOCAL_INIT_RC mechanism
Bug 23186545
Change-Id: Ib8cb6dffd2212f524298279787fd557bc84aa7b9
2015-09-03 16:32:54 -07:00
David Zeuthen
1b3195cb91
am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message."
...
* commit '4c223f4e396e1b66a945601561fce4cd63fc31ae':
Add slot_suffix field to struct bootloader_message.
2015-09-03 15:17:39 +00:00
David Zeuthen
4c223f4e39
Merge "Add slot_suffix field to struct bootloader_message."
2015-09-03 15:10:55 +00:00
Tao Bao
6f1f20622e
am 6997c287: Merge "updater: Clean up C codes."
...
* commit '6997c287bedbd32fb5ffb84fc2efd081e6f56d3e':
updater: Clean up C codes.
2015-09-03 00:32:04 +00:00
Tao Bao
6997c287be
Merge "updater: Clean up C codes."
2015-09-02 21:45:36 +00:00
David Zeuthen
d85ae79dc9
Add slot_suffix field to struct bootloader_message.
...
This is needed by fs_mgr for certain A/B implementations.
Change-Id: I7bb404d61198eb7a962c2b693911f5156745daae
2015-09-02 15:49:58 -04:00
Tao Bao
0940fe17b0
updater: Clean up C codes.
...
Replace C-string with std::string, pointers with references, and
variable-size arrays in struct with std::vector.
Change-Id: I57f361a0e58286cbcd113e9be225981da56721b2
2015-09-01 12:57:35 -07:00
Tao Bao
73468ee8fb
am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."
...
* commit '5a16eba2c323ecb4f1dd1ecb2ecea7a0ac8bdbb5':
updater: Remove the unused isunresumable in SaveStash().
2015-08-26 21:17:50 +00:00
Tao Bao
5a16eba2c3
am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."
...
* commit 'eef991389c7f739dd80bbe6e4a3699322c12dcfb':
updater: Remove the unused isunresumable in SaveStash().
2015-08-26 21:10:23 +00:00
Tao Bao
eef991389c
Merge "updater: Remove the unused isunresumable in SaveStash()."
2015-08-26 21:03:01 +00:00
Tao Bao
304c65b8fc
am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
...
* commit 'dc61d17d5b3c9e85a2863ec461170263325f1466':
GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
2015-08-26 01:14:31 +00:00
Tao Bao
9739a2920c
updater: Remove the unused isunresumable in SaveStash().
...
Change-Id: I6a8d9bea4c1cd8ea7b534682061b90e893b227a2
2015-08-25 18:05:38 -07:00
Tao Bao
dc61d17d5b
am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
...
* commit '50c17f9da69ed3de0cd3ed032c50af067c1dc1f1':
GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
2015-08-26 01:05:09 +00:00
Tao Bao
50c17f9da6
Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
2015-08-26 00:57:42 +00:00
Shrinivas Sahukar
a6153df887
GOOGLEGMS-749 Fix integer overflow while applying block based OTA package
...
There is an integer overflow when the size of system goes beyond the
signed int limits. Hence changing pos to size_t.
Change-Id: I6e5e1b2f0e72030b30a6df09a01642f4c82abc79
2015-08-21 15:59:28 -07:00
Tao Bao
822685a864
am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."
...
* commit 'dbbdcf3fd817128f89474f9ea8c84743fc648a1a':
edify: Switch to C++.
2015-08-21 18:20:17 +00:00
Tao Bao
dbbdcf3fd8
am 93fa4b67: Merge "edify: Switch to C++."
...
* commit '93fa4b677cac9288e936915f15ca8e5f76a4e4b6':
edify: Switch to C++.
2015-08-21 17:39:39 +00:00
Tao Bao
93fa4b677c
Merge "edify: Switch to C++."
2015-08-21 17:36:11 +00:00
Tao Bao
2a5a49d337
edify: Switch to C++.
...
Change-Id: I71aede6e29af1dc4bb858a62016c8035db5d3452
2015-08-20 12:11:04 -07:00
Tao Bao
a9a50fef97
am 4854e292: am ad509fd4: Merge "Fix potential crash"
...
* commit '4854e292e0cd0eb58bce4488dc849273904d9302':
Fix potential crash
2015-08-11 16:23:52 +00:00
Tao Bao
4854e292e0
am ad509fd4: Merge "Fix potential crash"
...
* commit 'ad509fd4a2c597ced8e53b0817f754cb2209b98a':
Fix potential crash
2015-08-11 16:17:24 +00:00
Tao Bao
ad509fd4a2
Merge "Fix potential crash"
2015-08-11 16:11:44 +00:00
Tao Bao
06e6ccb98a
am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."
...
* commit '434a1761aac48b8e3c13d5a6cb3edd90c8667f6f':
Use unique_ptr and unique_fd to manager FDs.
2015-08-10 17:42:19 +00:00
Tao Bao
b65a90235e
am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."
...
* commit '7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace':
updater: Clean up char* with std::string.
2015-08-10 17:37:52 +00:00
Tao Bao
434a1761aa
am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."
...
* commit '0d46c7ab02eb97d6b4b2e26b9202fd9b4e9dd8c8':
Use unique_ptr and unique_fd to manager FDs.
2015-08-10 17:35:06 +00:00
Tao Bao
7f89389a0b
am 7c511184: Merge "updater: Clean up char* with std::string."
...
* commit '7c511184bf3ed44f3590027730a64d565c0e12ee':
updater: Clean up char* with std::string.
2015-08-10 17:29:54 +00:00
Tao Bao
0d46c7ab02
Merge "Use unique_ptr and unique_fd to manager FDs."
2015-08-10 17:28:52 +00:00