PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,693 Commits 1 Branch 0 Tags
6e14f4f1d16476e06ad46e270b94de959742717c
Commit Graph

1693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes 39edb1b502 am 1e8bc40b: am 0005f89c: Split WipeData into PreWipeData and PostWipeData. 
* commit '1e8bc40b02e372403ba58e4681952347bea3fb34':
  Split WipeData into PreWipeData and PostWipeData.
 2015-06-11 01:33:29 +00:00
Elliott Hughes d2a592888b am 22ccc87a: Merge "Unmount sdcard if no package file is selected." 
* commit '22ccc87a7dffd089662a111aa96127b3476d65fc':
  Unmount sdcard if no package file is selected.
 2015-06-11 00:07:52 +00:00
Elliott Hughes 22ccc87a7d Merge "Unmount sdcard if no package file is selected." 2015-06-10 23:52:12 +00:00
Sami Tolvanen 7ccec497f2 am d7c9bf41: Merge "Zero blocks before BLKDISCARD" into mnc-dev 
* commit 'd7c9bf41daa865ca016dee12a68282ba457c31fb':
  Zero blocks before BLKDISCARD
 2015-06-10 23:17:32 +00:00
Elliott Hughes 1e8bc40b02 am 0005f89c: Split WipeData into PreWipeData and PostWipeData. 
* commit '0005f89c31dfc2ca9053512900571620a0eba842':
  Split WipeData into PreWipeData and PostWipeData.
 2015-06-10 23:16:36 +00:00
Elliott Hughes 07069f080e am 12c8ea68: am e21ff08e: am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData." 
* commit '12c8ea6827f2de5b4376524790dd9d2c9d6ef6ad':
  Split WipeData into PreWipeData and PostWipeData.
 2015-06-10 22:58:00 +00:00
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
Sami Tolvanen d7c9bf41da Merge "Zero blocks before BLKDISCARD" into mnc-dev 2015-06-10 21:50:03 +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 0005f89c31 Split WipeData into PreWipeData and PostWipeData. 
Bug: http://b/21760064
Change-Id: Idde268fe4d7e27586ca4469de16783f1ffdc5069
(cherry picked from commit 945548ef7b)
 2015-06-10 14:11:08 -07: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 abb78773a7 am a66cdf40: am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD" 
* commit 'a66cdf40c3d9ee8248049ce076673e3fe96a7080':
  Zero blocks before BLKDISCARD
 2015-06-10 20:54:03 +00:00
Sami Tolvanen 2cfa4d446b am 11cad65d: am 059e391f: am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD"" 
* commit '11cad65d2a2b829d5bae02589c6f1d167cf4e53f':
  Revert "Zero blocks before BLKDISCARD"
 2015-06-10 20:54:02 +00: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 b65f0272c8 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
(cherry picked from commit a3c75e3ea6)
 2015-06-10 20:36:02 +01: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 bb92714641 am 758f56ef: am 6abd52f6: Revert "Zero blocks before BLKDISCARD" 
* commit '758f56efd5401e508fecfd1ad26813ab3e5f3df8':
  Revert "Zero blocks before BLKDISCARD"
 2015-06-10 17:13:42 +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
caozhiyuan b4effb9807 Unmount sdcard if no package file is selected. 
Change-Id: I12b4f880802135a98dbc11a19e74172a3a5ef921
 2015-06-10 16:46:56 +08:00
Tao Bao a11ec11859 am 8ee89e7b: am b89452ef: am 1a03b400: Merge "uncrypt: Write status when it reboots to factory reset" 
* commit '8ee89e7b60e4b6c51a810b0f121a18dc079585e4':
  uncrypt: Write status when it reboots to factory reset
 2015-06-10 01:54:19 +00:00
Tao Bao c56cc1af34 am 5a1aa4c7: am 2880e0fc: (-s ours) am 2cf180f6: Merge "Separate uncrypt into two modes" 
* commit '5a1aa4c789335d1750a421ea5244663d20438cea':
  Separate uncrypt into two modes
 2015-06-10 01:54:19 +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
Sami Tolvanen 6f7b6e0e2d am 9df159da: am 604c583c: Zero blocks before BLKDISCARD 
* commit '9df159da877cad258dea99d7c2d24ced3797ff40':
  Zero blocks before BLKDISCARD
 2015-06-09 22:13:16 +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 8754c36641 am 1692fc8b: am 2fd12979: am 69608fe7: Merge "Zero blocks before BLKDISCARD" 
* commit '1692fc8bcba768cedd8bd5cc2a9875d354df1fcd':
  Zero blocks before BLKDISCARD
 2015-06-09 21:54:10 +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 a0f4278d95 am db553d5d: am 7baa13f6: am 3f9db6af: Merge "recovery: Switch to clang" 
* commit 'db553d5d5a3b413bf37339f735b3e8f2ad6d93b8':
  recovery: Switch to clang
 2015-06-03 23:05:01 +00: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 2b3d8b3acb am 3ed20cff: am 028d216c: am 227069d7: Merge "Fix build: fprintf without modifier" 
* commit '3ed20cffa685e4f89cdfdf71cd19058aa4137a08':
  Fix build: fprintf without modifier
 2015-06-03 19:23:26 +00:00