Tao Bao
2911c2d3ec
am c66b9ead
: am cd3c8c4e
: am b739a32b
: Merge "recovery: Add timestamps in update logs."
...
* commit 'c66b9ead27cdcdd94184a7c16e13369d4e62eb4d':
recovery: Add timestamps in update logs.
2015-09-18 04:15:57 +00:00
Tao Bao
c66b9ead27
am cd3c8c4e
: am b739a32b
: Merge "recovery: Add timestamps in update logs."
...
* commit 'cd3c8c4eacbab792e2144b4b71ace63100ff792a':
recovery: Add timestamps in update logs.
2015-09-18 04:11:40 +00:00
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
Narayan Kamath
cf91e14f1c
am 53cfad08
: (-s ours) am cde72079
: am 838768ca
: am 15da523e
: am 3c7f655b
: (-s ours) am 0e804d54
: am d396b9db
: am 710b6bb9
: am ec4b58ad
: (-s ours) am ec63d564
: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit '53cfad08cef87b7e81c664384ce971bc3df829df':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-17 02:54:57 +00:00
Narayan Kamath
53cfad08ce
am cde72079
: am 838768ca
: am 15da523e
: am 3c7f655b
: (-s ours) am 0e804d54
: am d396b9db
: am 710b6bb9
: am ec4b58ad
: (-s ours) am ec63d564
: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit 'cde720797f55ca3ca1bfc82b7b928447c37e7656':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-17 02:45:20 +00:00
Narayan Kamath
cde720797f
am 838768ca
: am 15da523e
: am 3c7f655b
: (-s ours) am 0e804d54
: am d396b9db
: am 710b6bb9
: am ec4b58ad
: (-s ours) am ec63d564
: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit '838768ca57d087025dbd31587ee895150bca9e10':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-16 23:12:11 +00:00
Narayan Kamath
838768ca57
am 15da523e
: am 3c7f655b
: (-s ours) am 0e804d54
: am d396b9db
: am 710b6bb9
: am ec4b58ad
: (-s ours) am ec63d564
: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit '15da523e5fe7dbdc3a8d49c809042bc760081920':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-16 23:06:09 +00:00
Narayan Kamath
15da523e5f
am 3c7f655b
: (-s ours) am 0e804d54
: am d396b9db
: am 710b6bb9
: am ec4b58ad
: (-s ours) am ec63d564
: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit '3c7f655bf0382776617d3c98293e28d9967c9a96':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-16 22:57:58 +00:00
Narayan Kamath
3c7f655bf0
am 0e804d54
: am d396b9db
: am 710b6bb9
: am ec4b58ad
: (-s ours) am ec63d564
: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit '0e804d542a2c151d254cad0d8581d9709a394a9a':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-16 22:48:24 +00:00
Narayan Kamath
0e804d542a
am d396b9db
: am 710b6bb9
: am ec4b58ad
: (-s ours) am ec63d564
: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit 'd396b9dbd99924f7c8687227b22220a87c85d9c7':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-16 22:33:14 +00:00
Tao Bao
4007899fd5
am 6e9f726f
: am f66e08a2
: am a42a322d
: Merge "updater: Manage buffers with std::vector."
...
* commit '6e9f726f8e897ec39320ebf099b4662788bb59a1':
updater: Manage buffers with std::vector.
2015-09-16 21:17:10 +00:00
Tao Bao
6e9f726f8e
am f66e08a2
: am a42a322d
: Merge "updater: Manage buffers with std::vector."
...
* commit 'f66e08a2a0c4bcc3f0447aac318e71b829e2743b':
updater: Manage buffers with std::vector.
2015-09-16 21:09:50 +00: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
e432b49879
am cd3a68ce
: am 49a49e4f
: am ee17242f
: Merge "minadbd: update service_to_fd() signature."
...
* commit 'cd3a68ce371fd446b0b5d8dde4f4a262be1e1fe9':
minadbd: update service_to_fd() signature.
2015-09-14 19:10:11 +00:00
David Pursell
cd3a68ce37
am 49a49e4f
: am ee17242f
: Merge "minadbd: update service_to_fd() signature."
...
* commit '49a49e4f0659696b71c0ec2d32a0ac4948c5d977':
minadbd: update service_to_fd() signature.
2015-09-14 19:02:41 +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
Narayan Kamath
d396b9dbd9
am 710b6bb9
: am ec4b58ad
: (-s ours) am ec63d564
: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit '710b6bb9d7d36ce16453850efc3112016a77e9ff':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-12 06:30:01 +00:00
Tao Bao
47506a2c96
am 8b2dcfb1
: am 60524198
: am b83fd518
: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."
...
* commit '8b2dcfb1049ddc2ff6111c4faa81ae20c6545285':
recovery: Remove redirect_stdio() when calling ShowFile().
2015-09-12 05:07:56 +00:00
Tao Bao
8b2dcfb104
am 60524198
: am b83fd518
: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."
...
* commit '605241984cc41f62e2f2e005865d7afed504a972':
recovery: Remove redirect_stdio() when calling ShowFile().
2015-09-12 01:24:49 +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
26679ce536
am 7c3d09c2
: am 0cf19d9b
: am 7a677807
: Merge "updater: Fix the line breaks in ui_print commands."
...
* commit '7c3d09c2f3524e546989125d75f7944f280fc6fe':
updater: Fix the line breaks in ui_print commands.
2015-09-10 21:01:35 +00:00
Narayan Kamath
710b6bb9d7
am ec4b58ad
: (-s ours) am ec63d564
: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit 'ec4b58ad8a21b511bf6b136792bb924eb6e9e299':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-10 20:55:33 +00:00
Tao Bao
7c3d09c2f3
am 0cf19d9b
: am 7a677807
: Merge "updater: Fix the line breaks in ui_print commands."
...
* commit '0cf19d9ba10c325af928e44d2c11bc74daa39a7c':
updater: Fix the line breaks in ui_print commands.
2015-09-10 20:54:23 +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
Narayan Kamath
ec4b58ad8a
am ec63d564
: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit 'ec63d564a86ad5b30f75aa307b4bd271f6a96a56':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-10 18:26:12 +00: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
74931e639a
am 272d268c
: am 50828f58
: am e520f1d4
: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."
...
* commit '272d268c17a181b4b20ea8c6101e6450511ce786':
updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
2015-09-09 18:31:55 +00:00
Tao Bao
272d268c17
am 50828f58
: am e520f1d4
: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."
...
* commit '50828f58caf1ee8f905c67f85c4dccd4a4f3304b':
updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
2015-09-09 18:09:21 +00: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
Narayan Kamath
ec63d564a8
Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
bug: 22953624
Change-Id: Ifcc17e39433ac91ca41da5d336fb3006dfbb65a8
2015-09-09 10:42:10 +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
282e572467
am d4547c1d
: am e5571a0f
: am 585a50ce
: Merge "imgdiff: fix file descriptor leak"
...
* commit 'd4547c1ddaf6ac4b13e9a160582f6baba44860b6':
imgdiff: fix file descriptor leak
2015-09-08 17:57:58 +00:00
Tao Bao
d4547c1dda
am e5571a0f
: am 585a50ce
: Merge "imgdiff: fix file descriptor leak"
...
* commit 'e5571a0ff8217a6fe1b3defdb22295596e36c280':
imgdiff: fix file descriptor leak
2015-09-08 17:54:19 +00: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
f6dd99f509
am 1e8e6a83
: am cf11a160
: am f8c303f9
: Merge "move uncrypt from init.rc to uncrypt.rc"
...
* commit '1e8e6a839438a345a9054319d8efda6c95236557':
move uncrypt from init.rc to uncrypt.rc
2015-09-04 18:13:01 +00:00
Tom Cherry
1e8e6a8394
am cf11a160
: am f8c303f9
: Merge "move uncrypt from init.rc to uncrypt.rc"
...
* commit 'cf11a1601522c669c6df2095d71601546cc7fc7f':
move uncrypt from init.rc to uncrypt.rc
2015-09-04 18:02:34 +00: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