Commit Graph

1747 Commits

Author SHA1 Message Date
Tao Bao cc9dd3d524 Merge "updater: Bump up the BBOTA version to 4."
am: f204185f71

* commit 'f204185f7138687769f95c28fe22fa88143bc004':
  updater: Bump up the BBOTA version to 4.
2015-10-23 18:45:30 +00:00
Tao Bao f204185f71 Merge "updater: Bump up the BBOTA version to 4." 2015-10-23 18:37:33 +00:00
Tao Bao 1fdec8685a updater: Bump up the BBOTA version to 4.
To accommodate new changes in N release, such as error correction [1]
and other potential changes to the updater.

[1]: commit 0a7b47397d

Change-Id: I4dd44417d07dd0a31729894628635a0aa1659008
2015-10-22 17:04:28 -07:00
Sami Tolvanen 339ec2ef02 am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery"
* commit '78615fa50bb10318035d31bccdf502913e1041b7':
  Error correction: Use libfec in blockimg.cpp for recovery
2015-10-19 10:06:42 -07:00
Sami Tolvanen 78615fa50b Merge "Error correction: Use libfec in blockimg.cpp for recovery" 2015-10-19 17:03:04 +00:00
Sami Tolvanen 0a7b47397d Error correction: Use libfec in blockimg.cpp for recovery
Add block_image_recover function to rewrite corrupted blocks on the
partition. This can be attempted if block_image_verify fails.

Note that we cannot use libfec during block_image_update as it may
overwrite blocks required for error correction. A separate recovery
pass in case the image is corrupted is the only viable option.

Bug: 21893453
Change-Id: I6ff25648fff68d5f50b41a601c95c509d1cc5bce
2015-10-19 10:04:38 +01:00
Tao Bao 4c6c96a595 am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."
* commit '245b2da1711db8a9b8e333395d68235df5163483':
  updater: Skip empty lines in the transfer list file.
2015-09-30 23:59:57 +00:00
Tao Bao 245b2da171 am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."
* commit '754ebaa90a3e11012e2456013e69b34a30272c4a':
  updater: Skip empty lines in the transfer list file.
2015-09-30 23:44:35 +00:00
Tao Bao 754ebaa90a Merge "updater: Skip empty lines in the transfer list file." 2015-09-30 23:29:11 +00:00
Yabin Cui 6eb2668de1 am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."
* commit 'aa59a9898824c39cad3f1a1dde5fc4c8ceeabb40':
  minadbd: use strdup() to create argument for sideload thread.
2015-09-30 20:16:54 +00:00
Yabin Cui aa59a98988 am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."
* commit '4b66a280d314ab5aeb5027fe5b0023ae1f25ecca':
  minadbd: use strdup() to create argument for sideload thread.
2015-09-30 20:10:51 +00:00
Yabin Cui 4b66a280d3 Merge "minadbd: use strdup() to create argument for sideload thread." 2015-09-30 17:43:59 +00:00
Yabin Cui c8a3c80603 minadbd: use strdup() to create argument for sideload thread.
So sideload thread will not use argument which is to be freed
in the main thread.

Bug: 23968770
Change-Id: I9d6dadc6c33cfbe4b5759382a80fe14cd0d54355
2015-09-29 18:09:34 -07:00
Tao Bao 6a47dffde5 updater: Skip empty lines in the transfer list file.
We have the last line being empty as a result of
android::base::Split("a\nb\n"), which leads to "missing command"
warnings in the update. Just skip all the empty lines.

Bug: 24373789
Change-Id: I5827e4600bd5cf0418d95477e4592fec47bbd3a9
2015-09-25 17:12:28 -07:00
Tao Bao d715674899 am f61eec3e: am 2bdac629: Merge changes Ic769eafc,I63f28b3b
* commit 'f61eec3e2db4e0e9bfa37cff23e5e05c92384e83':
  updater: Use android::base::ParseInt() to parse integers.
  Suppress some compiler warnings due to signedness.
2015-09-25 18:39:26 +00:00
Tao Bao f61eec3e2d am 2bdac629: Merge changes Ic769eafc,I63f28b3b
* commit '2bdac629f1d109dc79370edec8a31e20fbbe384c':
  updater: Use android::base::ParseInt() to parse integers.
  Suppress some compiler warnings due to signedness.
2015-09-25 18:32:55 +00:00
Tao Bao 2bdac629f1 Merge changes Ic769eafc,I63f28b3b
* changes:
  updater: Use android::base::ParseInt() to parse integers.
  Suppress some compiler warnings due to signedness.
2015-09-25 18:28:10 +00:00
Tao Bao b15fd224ed updater: Use android::base::ParseInt() to parse integers.
Change-Id: Ic769eafc8d9535b1d517d3dcbd398c3fd65cddd9
2015-09-24 12:14:37 -07:00
Tao Bao 5701d5829d Suppress some compiler warnings due to signedness.
Change-Id: I63f28b3b4ba4185c23b972fc8f93517295b1672a
2015-09-24 11:06:58 -07:00
Yabin Cui 7c7d876d15 am f7319f4d: am 3317d501: Merge "minadbd: move from D() to VLOG()."
* commit 'f7319f4dbd04f72a53f5ad313794ade240530406':
  minadbd: move from D() to VLOG().
2015-09-23 23:20:55 +00:00
Yabin Cui f7319f4dbd am 3317d501: Merge "minadbd: move from D() to VLOG()."
* commit '3317d5017963684cdbf4573d6cc6c0ff4cee0869':
  minadbd: move from D() to VLOG().
2015-09-23 23:11:11 +00:00
Yabin Cui 3317d50179 Merge "minadbd: move from D() to VLOG()." 2015-09-23 23:05:32 +00:00
Yabin Cui 7c913e5faa minadbd: move from D() to VLOG().
Change-Id: I542e2ae8f5ef18b2d6b3dbc1888b3ce1e02a7404
2015-09-23 16:04:41 -07: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 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 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 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 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
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