PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,396 Commits 1 Branch 0 Tags
89d3634ffe0855456fe4b33b6aa2abdffeeddfc6
Commit Graph
1396 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao BaoandAndroid Git Automerger 89d3634ffe am b36d9c3f: Merge "More accurate checking for overlapped ranges." 
* commit 'b36d9c3f00e75dba464ff62eab94dd46d93ac94e':
  More accurate checking for overlapped ranges.
 2015-06-26 00:25:15 +00:00
Tao BaoandGerrit Code Review b36d9c3f00 Merge "More accurate checking for overlapped ranges." 2015-06-26 00:16:59 +00:00
Tao Bao c0f56ad766 More accurate checking for overlapped ranges. 
A RangeSet has half-closed half-open bounds. For example, "3,5" contains
blocks 3 and 4. So "3,5" and "5,7" are actually not overlapped.

Bug: 22098085
Change-Id: I75e54a6506f2a20255d782ee710e889fad2eaf29
 2015-06-25 17:07:45 -07:00
Tao BaoandAndroid Git Automerger 1572820cd0 am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices" 
* commit 'ec18d495058a9a6dd6f3dd442aa0f5d0041504e4':
  recovery: Use xxhdpi resources for 560dpi devices
 2015-06-24 19:42:39 +00:00
Tao BaoandGerrit Code Review ec18d49505 Merge "recovery: Use xxhdpi resources for 560dpi devices" 2015-06-24 19:31:37 +00:00
Tao Bao 0b7dc1dfcd recovery: Use xxhdpi resources for 560dpi devices 
Create a symbolic link to res-xxhdpi for res-560dpi. 560dpi devices
(like shamu) are currently using a fallback option of xhdpi (320dpi)
resources. Now they can get closer ones (480dpi), such as larger fonts
on UI screen.

Change-Id: I427c3091d7e9892d9a7a1886be6adca14c122b06
 2015-06-24 18:59:23 +00:00
Elliott HughesandAndroid Git Automerger 4b6194696e am 719e4e5d: Merge "Just use fstat in sysMapFile." 
* commit '719e4e5d9bb7b7f9ffbe48407feee8c985ce7623':
  Just use fstat in sysMapFile.
 2015-06-24 00:46:47 +00:00
Elliott HughesandGerrit Code Review 719e4e5d9b Merge "Just use fstat in sysMapFile." 2015-06-24 00:34:45 +00:00
Elliott Hughes f267dee1ca Just use fstat in sysMapFile. 
Also turn on -Werror and remove a dead function.

Change-Id: I436f0a91c40e36db985190b3b98b0a4527cf0eeb
 2015-06-23 12:31:02 -07:00
Elliott HughesandAndroid Git Automerger 6dd443fd51 am ea13fe23: Merge "Allow sideloading without authentication." 
* commit 'ea13fe233e8a95d9e5b69b131fbf840a60d1f04e':
  Allow sideloading without authentication.
 2015-06-23 18:47:10 +00:00
Elliott HughesandGerrit Code Review ea13fe233e Merge "Allow sideloading without authentication." 2015-06-23 18:33:41 +00:00
Elliott Hughes 9813f5ba57 Allow sideloading without authentication. 
Bug: http://b/22025550
Change-Id: I20f09ae442536f924f19ede0abf6a2bcc0a5cedf
 2015-06-23 11:12:58 -07:00
Elliott HughesandAndroid Git Automerger 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 HughesandGerrit Code Review 22ccc87a7d Merge "Unmount sdcard if no package file is selected." 2015-06-10 23:52:12 +00:00
Elliott HughesandAndroid Git Automerger 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 HughesandGerrit Code Review 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 TolvanenandAndroid Git Automerger 915fc970d1 am 280cb6e9: Merge "Zero blocks before BLKDISCARD" 
* commit '280cb6e90c3379072d7677101564b23dfb70182c':
  Zero blocks before BLKDISCARD
 2015-06-10 18:21:56 +00:00
Sami TolvanenandGerrit Code Review 280cb6e90c Merge "Zero blocks before BLKDISCARD" 2015-06-10 18:11:13 +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 TolvanenandAndroid Git Automerger 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 TolvanenandGerrit Code Review 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
caozhiyuan b4effb9807 Unmount sdcard if no package file is selected. 
Change-Id: I12b4f880802135a98dbc11a19e74172a3a5ef921
 2015-06-10 16:46:56 +08:00
Tao BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 BaoandGerrit Code Review 1a03b40090 Merge "uncrypt: Write status when it reboots to factory reset" 2015-06-10 00:43:16 +00:00
Tao BaoandGerrit Code Review 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 TolvanenandAndroid Git Automerger 2fd12979ea am 69608fe7: Merge "Zero blocks before BLKDISCARD" 
* commit '69608fe7548727ee765c89f69a6861479f391487':
  Zero blocks before BLKDISCARD
 2015-06-09 21:28:46 +00:00
Sami TolvanenandGerrit Code Review 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 BaoandAndroid Git Automerger 7baa13f6d6 am 3f9db6af: Merge "recovery: Switch to clang" 
* commit '3f9db6af3d8f8659637da7288e9e2bceda4366d0':
  recovery: Switch to clang
 2015-06-03 22:38:50 +00:00
Tao BaoandGerrit Code Review 3f9db6af3d Merge "recovery: Switch to clang" 2015-06-03 22:30:40 +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 BaoandAndroid Git Automerger 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 BaoandGerrit Code Review 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 BaoandAndroid Git Automerger 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 BaoandGerrit Code Review 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
Elliott HughesandAndroid Git Automerger 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 HughesandGerrit Code Review 1441a9654f Merge "Really don't use TEMP_FAILURE_RETRY with close in recovery." 2015-05-29 18:02:57 +00:00
Tao BaoandAndroid Git Automerger eec204be63 am 74f5e0e0: Merge "Use f_bavail to calculate free space" 
* commit '74f5e0e09e16ba38d007fdc4aeede20129c817bc':
  Use f_bavail to calculate free space
 2015-05-29 06:32:54 +00:00
Tao BaoandGerrit Code Review 74f5e0e09e Merge "Use f_bavail to calculate free space" 2015-05-29 06:21:07 +00:00
Elliott Hughes b3ac676192 Really don't use TEMP_FAILURE_RETRY with close in recovery. 
I missed one last time.

Bug: http://b/20501816
Change-Id: I9896ee2704237d61ee169f898680761e946e0a56
 2015-05-28 23:06:17 -07:00
caozhiyuan 3b4977638f Use f_bavail to calculate free space 
Failures are seen on devices with
Linux 3.10. And they are mainly due to this change:
https://lwn.net/Articles/546473/
The blocks reserved in this change is not the same thing as what we
think are reserved for common usage of root user. And this part is
included in free blocks but not in available blocks.

Change-Id: Ib29e12d775b86ef657c0af7fa7a944d2b1e12dc8
 2015-05-29 13:32:49 +08:00
Sami TolvanenandAndroid Git Automerger cd391c2388 am aa4df5c4: Merge "Handle BLKDISCARD failures" 
* commit 'aa4df5c45b99438282db3a94cb7682c480e0eccd':
  Handle BLKDISCARD failures
 2015-05-28 16:21:04 +00:00
Sami TolvanenandGerrit Code Review aa4df5c45b Merge "Handle BLKDISCARD failures" 2015-05-28 16:12:25 +00:00