Commit Graph

1898 Commits

Author SHA1 Message Date
Paul Lawrence fd1bfa2a41 Merge "Create convert_fbe breadcrumb file to support conversion to FBE" 2015-11-13 17:25:09 +00:00
Elliott Hughes 11c26abe2d Merge "We can use fclose directly in std::unique_ptr."
am: 5c6912148b

* commit '5c6912148b2143cbdf4cc580c723fac05e9324f8':
  We can use fclose directly in std::unique_ptr.
2015-11-13 16:37:44 +00:00
Elliott Hughes 5c6912148b Merge "We can use fclose directly in std::unique_ptr." 2015-11-13 16:27:55 +00:00
Paul Lawrence d0db337d72 Create convert_fbe breadcrumb file to support conversion to FBE
Change-Id: I38b29e1e34ea793e4b87cd27a1d39fa905fddf7a
2015-11-13 07:49:31 -08:00
Elliott Hughes 63b089e3aa We can use fclose directly in std::unique_ptr.
It turns out the standard explicitly states that if the pointer is
null, the deleter function won't be called. So it doesn't matter that
fclose(3) doesn't accept null.

Change-Id: I10e6e0d62209ec03ac60e673edd46f32ba279a04
2015-11-12 21:07:55 -08:00
Tao Bao 8b5f9d74a0 Merge "uncrypt: remove O_SYNC to avoid time-out failures"
am: e4a3da9f51

* commit 'e4a3da9f51ca1e02179a1e0851f26015f4ec07fa':
  uncrypt: remove O_SYNC to avoid time-out failures
2015-11-05 18:07:57 +00:00
Tao Bao e4a3da9f51 Merge "uncrypt: remove O_SYNC to avoid time-out failures" 2015-11-05 18:02:05 +00:00
Jaegeuk Kim cc4e3c6002 uncrypt: remove O_SYNC to avoid time-out failures
This patch removes costly O_SYNC flag for encrypted block device.
After writing whole decrypted blocks, fsync should guarantee their consistency
from further power failures.
This patch reduces the elapsed time significantly consumed by upgrading packages
on an encrypted partition, so that it could avoid another time-out failures too.

Change-Id: I1fb9022c83ecc00bad09d107fc87a6a09babb0ec
Signed-off-by: Jaegeuk Kim <jaegeuk@motorola.com>
2015-11-04 11:43:58 -08:00
Tao Bao c40d9afaa4 Merge "recovery: Depend on mkfs.f2fs only if needed." am: a412198699
am: 4ea2b0c4ac

* commit '4ea2b0c4acddb4509c741ba0390be7b39e0b9de1':
  recovery: Depend on mkfs.f2fs only if needed.
2015-10-28 16:43:27 +00:00
Tao Bao 4ea2b0c4ac Merge "recovery: Depend on mkfs.f2fs only if needed."
am: a412198699

* commit 'a4121986990d7dde7918252a96d87e4c3c11c13c':
  recovery: Depend on mkfs.f2fs only if needed.
2015-10-28 16:36:23 +00:00
Tao Bao a412198699 Merge "recovery: Depend on mkfs.f2fs only if needed." 2015-10-28 16:32:50 +00:00
Tao Bao f68351209f recovery: Depend on mkfs.f2fs only if needed.
Don't build mkfs.f2fs unless device defines TARGET_USERIMAGES_USE_F2FS.

Change-Id: Ifac592c30315bbe7590c8fbf3a0844e6a7a31a1a
2015-10-27 22:00:35 -07:00
Tao Bao 03540bc978 Merge "updater: Bump up the BBOTA version to 4." am: f204185f71
am: cc9dd3d524

* commit 'cc9dd3d524755da156ec95ed3a91bcf7966e7e7e':
  updater: Bump up the BBOTA version to 4.
2015-10-23 18:55:13 +00:00
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 a2fcae8130 am 339ec2ef: am 78615fa5: Merge "Error correction: Use libfec in blockimg.cpp for recovery"
* commit '339ec2ef02614f17823f9b00af8b35c1f8ee734c':
  Error correction: Use libfec in blockimg.cpp for recovery
2015-10-19 17:14:01 +00: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 e228541fca am 4c6c96a5: am 245b2da1: am 754ebaa9: Merge "updater: Skip empty lines in the transfer list file."
* commit '4c6c96a59566e8e876cc803be84c16d3f04f31d4':
  updater: Skip empty lines in the transfer list file.
2015-10-01 00:05:23 +00: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 089f41b514 am 6eb2668d: am aa59a989: am 4b66a280: Merge "minadbd: use strdup() to create argument for sideload thread."
* commit '6eb2668de1afca57b7c64532f98f84b7fcec1f60':
  minadbd: use strdup() to create argument for sideload thread.
2015-09-30 20:24:23 +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 6b3b220066 am d7156748: am f61eec3e: am 2bdac629: Merge changes Ic769eafc,I63f28b3b
* commit 'd715674899b9026ce5f5c653dc218fc7b67f9c7b':
  updater: Use android::base::ParseInt() to parse integers.
  Suppress some compiler warnings due to signedness.
2015-09-25 19:00:27 +00: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 00ba4c2837 am 7c7d876d: am f7319f4d: am 3317d501: Merge "minadbd: move from D() to VLOG()."
* commit '7c7d876d152e27a5b15617f9e907e18314f08fa5':
  minadbd: move from D() to VLOG().
2015-09-23 23:26:55 +00: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 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