PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,484 Commits 1 Branch 0 Tags
12c8ea6827f2de5b4376524790dd9d2c9d6ef6ad
Commit Graph

1484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes 12c8ea6827 am e21ff08e: am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData." 
* commit 'e21ff08ea6a94bcd751a3cb0e6123275e0f18a2b':
  Split WipeData into PreWipeData and PostWipeData.
 2015-06-10 22:47:51 +00:00
Elliott Hughes e21ff08ea6 am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData." 
* commit 'a1009c346827c89f35d4feb011d01dd18de1b134':
  Split WipeData into PreWipeData and PostWipeData.
 2015-06-10 21:28:45 +00:00
Elliott Hughes a1009c3468 Merge "Split WipeData into PreWipeData and PostWipeData." 2015-06-10 21:10:24 +00:00
Elliott Hughes 945548ef7b Split WipeData into PreWipeData and PostWipeData. 
Bug: http://b/21760064
Change-Id: Idde268fe4d7e27586ca4469de16783f1ffdc5069
 2015-06-10 14:09:31 -07:00
Sami Tolvanen a66cdf40c3 am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD" 
* commit '915fc970d1a5181496f846cd8673716966ddf6fb':
  Zero blocks before BLKDISCARD
 2015-06-10 20:36:51 +00:00
Sami Tolvanen 11cad65d2a am 059e391f: am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD"" 
* commit '059e391f9eac7fd2d152da79fbfac9b0bb5a2fad':
  Revert "Zero blocks before BLKDISCARD"
 2015-06-10 20:36:23 +00:00
Sami Tolvanen 915fc970d1 am 280cb6e9: Merge "Zero blocks before BLKDISCARD" 
* commit '280cb6e90c3379072d7677101564b23dfb70182c':
  Zero blocks before BLKDISCARD
 2015-06-10 18:21:56 +00:00
Sami Tolvanen 280cb6e90c Merge "Zero blocks before BLKDISCARD" 2015-06-10 18:11:13 +00:00
Sami Tolvanen 758f56efd5 am 6abd52f6: Revert "Zero blocks before BLKDISCARD" 
* commit '6abd52f62be24981398a99ebefc8717eb2294f97':
  Revert "Zero blocks before BLKDISCARD"
 2015-06-10 16:13:10 +00:00
Sami Tolvanen a3c75e3ea6 Zero blocks before BLKDISCARD 
Due to observed BLKDISCARD flakiness, overwrite blocks that we want
to discard with zeros first to avoid later issues with dm-verity if
BLKDISCARD is not successful.

Bug: 20614277
Bug: 20881595
Change-Id: I4f6f2db39db990879ff10468c9db41606497bd6f
 2015-06-10 17:09:48 +01:00
Sami Tolvanen 059e391f9e am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD"" 
* commit 'e6f6097a7d59ae8443d7c7e5e39ecdc43b77f3ab':
  Revert "Zero blocks before BLKDISCARD"
 2015-06-10 16:06:49 +00:00
Sami Tolvanen e6f6097a7d Merge "Revert "Zero blocks before BLKDISCARD"" 2015-06-10 15:58:28 +00:00
Sami Tolvanen e82fa18d3d Revert "Zero blocks before BLKDISCARD" 
This reverts commit 96392b97f6.

Change-Id: I77acc27158bad3cd8948390a3955197646a43a31
 2015-06-10 15:58:12 +00:00
Sami Tolvanen 6abd52f62b Revert "Zero blocks before BLKDISCARD" 
This reverts commit 604c583c9d.

Change-Id: I2b0b283dc3f44bae55c5e9f7231d7c712630c2b5
 2015-06-10 15:52:04 +00:00
Tao Bao 8ee89e7b60 am b89452ef: am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset" 
* commit 'b89452efa8d1a17ab67301ed87083bd12f09cf0a':
  uncrypt: Write status when it reboots to factory reset
 2015-06-10 01:42:12 +00:00
Tao Bao 5a1aa4c789 am 2880e0fc: (-s ours) am 2cf180f6: Merge "Separate uncrypt into two modes" 
* commit '2880e0fc5fe0f485209c49f1a2474b6d6ad46148':
  Separate uncrypt into two modes
 2015-06-10 01:42:11 +00:00
Tao Bao b89452efa8 am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset" 
* commit '1a03b4009095f0e766da19338e4681d715feeb90':
  uncrypt: Write status when it reboots to factory reset
 2015-06-10 00:55:33 +00:00
Tao Bao 2880e0fc5f am 2cf180f6: Merge "Separate uncrypt into two modes" 
* commit '2cf180f6cc3275592f82a57ab98b72723937e0fb':
  Separate uncrypt into two modes
 2015-06-10 00:55:32 +00:00
Tao Bao 1a03b40090 Merge "uncrypt: Write status when it reboots to factory reset" 2015-06-10 00:43:16 +00:00
Tao Bao 2cf180f6cc Merge "Separate uncrypt into two modes" 2015-06-10 00:43:07 +00:00
Tao Bao ac6aa7ede0 uncrypt: Write status when it reboots to factory reset 
When it reboots into recovery for a factory reset, it still needs to
write the uncrypt status (-1) to the pipe.

Bug: 21511893
(cherry picked from commit 2c2cae8a4a)
Change-Id: Ia5a75c5edf3afbd916153da1b4de4db2f00d0209
 2015-06-09 15:02:22 -07:00
Tao Bao 383b00d0e4 Separate uncrypt into two modes 
uncrypt needs to be triggered to prepare the OTA package before
rebooting into the recovery. Separate uncrypt into two modes. In
mode 1, it uncrypts the OTA package, but will not reboot the
device. In mode 2, it wipes the /misc partition and reboots.

Needs matching changes in frameworks/base, system/core and
external/sepolicy to work properly.

Bug: 20012567
Bug: 20949086
(cherry picked from commit 158e11d673)
Change-Id: I349f6d368a0d6f6ee4332831c4cd4075a47426ff
 2015-06-09 15:01:10 -07:00
Sami Tolvanen 9df159da87 am 604c583c: Zero blocks before BLKDISCARD 
* commit '604c583c9dd3d47906b1a57c14a7e9650df7471e':
  Zero blocks before BLKDISCARD
 2015-06-09 21:58:46 +00:00
Sami Tolvanen 1692fc8bcb am 2fd12979: am 69608fe7: Merge "Zero blocks before BLKDISCARD" 
* commit '2fd12979eac8987d4aaa89b56c508a710450c33d':
  Zero blocks before BLKDISCARD
 2015-06-09 21:38:58 +00:00
Sami Tolvanen 2fd12979ea am 69608fe7: Merge "Zero blocks before BLKDISCARD" 
* commit '69608fe7548727ee765c89f69a6861479f391487':
  Zero blocks before BLKDISCARD
 2015-06-09 21:28:46 +00:00
Sami Tolvanen 604c583c9d Zero blocks before BLKDISCARD 
Due to observed BLKDISCARD flakiness, overwrite blocks that we want
to discard with zeros first to avoid later issues with dm-verity if
BLKDISCARD is not successful.

Bug: 20614277
Bug: 20881595
Change-Id: I0280fe115b020dcab35f49041fb55b7f8e793da3
(cherry picked from commit 96392b97f6)
 2015-06-09 22:21:44 +01:00
Sami Tolvanen 69608fe754 Merge "Zero blocks before BLKDISCARD" 2015-06-09 21:17:20 +00:00
Sami Tolvanen 96392b97f6 Zero blocks before BLKDISCARD 
Due to observed BLKDISCARD flakiness, overwrite blocks that we want
to discard with zeros first to avoid later issues with dm-verity if
BLKDISCARD is not successful.

Bug: 20614277
Bug: 20881595
Change-Id: I0280fe115b020dcab35f49041fb55b7f8e793da3
 2015-06-09 21:57:06 +01:00
Tao Bao db553d5d5a am 7baa13f6: am 3f9db6af: Merge "recovery: Switch to clang" 
* commit '7baa13f6d6ffa77e35e3596018efa5ca9a1febf7':
  recovery: Switch to clang
 2015-06-03 22:52:08 +00:00
Tao Bao 7baa13f6d6 am 3f9db6af: Merge "recovery: Switch to clang" 
* commit '3f9db6af3d8f8659637da7288e9e2bceda4366d0':
  recovery: Switch to clang
 2015-06-03 22:38:50 +00:00
Tao Bao 3f9db6af3d Merge "recovery: Switch to clang" 2015-06-03 22:30:40 +00:00
Tao Bao 3ed20cffa6 am 028d216c: am 227069d7: Merge "Fix build: fprintf without modifier" 
* commit '028d216c83f80673a125d946d555d43418307c81':
  Fix build: fprintf without modifier
 2015-06-03 18:36:27 +00:00
Tao Bao 5393149d53 am d107e6dc: am a69e608a: Merge "Log update outputs in order" 
* commit 'd107e6dc104dfb6e5043cedaf348f354f7cd46cc':
  Log update outputs in order
 2015-06-03 18:36:16 +00:00
Tao Bao 80e46e08de recovery: Switch to clang 
And a few trival fixes to suppress warnings.

Change-Id: I38734b5f4434643e85feab25f4807b46a45d8d65
 2015-06-03 11:30:03 -07:00
Tao Bao 028d216c83 am 227069d7: Merge "Fix build: fprintf without modifier" 
* commit '227069d77f90aa7965d4cd5ab4f4a5302194fc73':
  Fix build: fprintf without modifier
 2015-06-03 17:17:50 +00:00
Tao Bao 227069d77f Merge "Fix build: fprintf without modifier" 2015-06-03 17:06:50 +00:00
Tao Bao 1eb9003b77 Fix build: fprintf without modifier 
Change-Id: I66ae21a25a25fa3c70837bc54a7d406182d4cf37
 2015-06-03 09:55:38 -07:00
Tao Bao d107e6dc10 am a69e608a: Merge "Log update outputs in order" 
* commit 'a69e608a521f7818cc0f17ba86710bd5b18137f2':
  Log update outputs in order
 2015-06-03 16:28:46 +00:00
Tao Bao a69e608a52 Merge "Log update outputs in order" 2015-06-03 16:15:50 +00:00
Tao Bao b6918c7c43 Log update outputs in order 
Although stdout and stderr are both redirected to log file with no
buffering, we are seeing some outputs are mixed in random order.
This is because ui_print commands from the updater are passed to the
recovery binary via a pipe, which may interleave with other outputs
that go to stderr directly.

In recovery, adding ui::PrintOnScreenOnly() function to handle
ui_print command, which skips printing to stdout. Meanwhile, updater
prints the contents to stderr in addition to piping them to recovery.

Change-Id: Idda93ea940d2e23a0276bb8ead4aa70a3cb97700
 2015-06-02 22:15:40 -07:00
Tao Bao 2c51ec953c am 02b64725: Merge "uncrypt: Write status when it reboots to factory reset" into mnc-dev 
* commit '02b6472546b899ebc16029371eb75364059871d2':
  uncrypt: Write status when it reboots to factory reset
 2015-06-01 16:03:51 +00:00
Elliott Hughes 7132e79266 am b5dabd25: Really don\'t use TEMP_FAILURE_RETRY with close in recovery. 
* commit 'b5dabd25e1d04ce134837b49fbef889e511d4d35':
  Really don't use TEMP_FAILURE_RETRY with close in recovery.
 2015-06-01 15:26:54 +00:00
Sami Tolvanen 07ec625a61 am 92eea1bc: Handle BLKDISCARD failures 
* commit '92eea1bc414a7b6faedaf812c33ede17403fcaf7':
  Handle BLKDISCARD failures
 2015-06-01 15:26:53 +00:00
Tao Bao 02b6472546 Merge "uncrypt: Write status when it reboots to factory reset" into mnc-dev 2015-05-29 22:02:27 +00:00
Tao Bao 2c2cae8a4a uncrypt: Write status when it reboots to factory reset 
When it reboots into recovery for a factory reset, it still needs to
write the uncrypt status (-1) to the pipe.

Bug: 21511893
Change-Id: I1a725820f1e1875146e49b5a6f28af2fbf284fc7
 2015-05-29 14:24:02 -07:00
Elliott Hughes 8339bc672a am 5944bcd8: am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery." 
* commit '5944bcd8eba6f012c1439972c050a2dc874765ae':
  Really don't use TEMP_FAILURE_RETRY with close in recovery.
 2015-05-29 18:30:30 +00:00
Elliott Hughes 5944bcd8eb am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery." 
* commit '1441a9654feee7e32ec6b39b1992c27635feb50f':
  Really don't use TEMP_FAILURE_RETRY with close in recovery.
 2015-05-29 18:16:47 +00:00
Elliott Hughes b5dabd25e1 Really don't use TEMP_FAILURE_RETRY with close in recovery. 
I missed one last time.

Bug: http://b/20501816
Change-Id: I9896ee2704237d61ee169f898680761e946e0a56
(cherry picked from commit b3ac676192)
 2015-05-29 11:03:44 -07:00
Elliott Hughes 1441a9654f Merge "Really don't use TEMP_FAILURE_RETRY with close in recovery." 2015-05-29 18:02:57 +00:00
Sami Tolvanen 92eea1bc41 Handle BLKDISCARD failures 
In the block updater, if BLKDISCARD fails, the error is silently
ignored and some of the blocks may not be erased. This means the
target partition will have inconsistent contents.

If the ioctl fails, return an error and abort the update.

Bug: 20614277
Change-Id: I33867ba9337c514de8ffae59f28584b285324067
(cherry picked from commit cc2428c818)
 2015-05-29 09:02:14 +01:00