Commit Graph

1417 Commits

Author SHA1 Message Date
Tao Bao 87f2c673df am cc3c3414: Merge "updater: libapplypatch needs libbase now."
* commit 'cc3c34145e4816a84fe597ce273b016ae9587530':
  updater: libapplypatch needs libbase now.
2015-07-24 18:18:41 +00:00
Tao Bao 1dc71bec8d am cfd9d9c7: Merge "applypatch: Refactor strtok()."
* commit 'cfd9d9c7ce03b847946977a98efcbfca2f067fd3':
  applypatch: Refactor strtok().
2015-07-24 18:18:39 +00:00
Tao Bao cc3c34145e Merge "updater: libapplypatch needs libbase now." 2015-07-24 18:10:21 +00:00
Tao Bao ba8a6789f7 updater: libapplypatch needs libbase now.
Change-Id: I18da9e6da64fccab495dc5a96e3efd95cc6d88bf
(cherry picked from commit 1b1ea17d55)
2015-07-24 11:09:36 -07:00
Tao Bao cfd9d9c7ce Merge "applypatch: Refactor strtok()." 2015-07-24 18:08:50 +00:00
Tao Bao aca8e89603 applypatch: Refactor strtok().
We have android::base::Split() for the work.

Change-Id: I0fb562feb203c9b15e2f431d8e84355fd682376a
(cherry picked from commit 0a47ce27de)
2015-07-24 11:08:14 -07:00
Tao Bao b91e700544 am 85090d0c: Merge "recovery: Switch fuse_* to C++."
* commit '85090d0c98f1684147fc180a8b2adea93e4af642':
  recovery: Switch fuse_* to C++.
2015-07-20 19:16:45 +00:00
Tao Bao 85090d0c98 Merge "recovery: Switch fuse_* to C++." 2015-07-20 19:00:11 +00:00
Tao Bao 71dc365f25 recovery: Switch fuse_* to C++.
Change-Id: I68770ad1a9e99caee292f8010cfd37dfea3acc64
2015-07-20 11:57:40 -07:00
Tao Bao 328cb8cb5a am 025c0e79: Merge "Clean up LOG functions."
* commit '025c0e79c3e05babd4df0bab8249466b489c0870':
  Clean up LOG functions.
2015-07-17 05:23:59 +00:00
Tao Bao 025c0e79c3 Merge "Clean up LOG functions." 2015-07-17 05:13:44 +00:00
Tao Bao dd4d9818a8 Clean up LOG functions.
For fatal errors, use LOGE to show messages.

Bug: 22236461
Change-Id: I2b7d761576894ac37fcbadcba690ae14affe8f07
(cherry picked from commit d7d0f75034)
2015-07-16 22:12:32 -07:00
Tao Bao 307eecfdc7 am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."
* commit '0bacbfd03c866b9078f86216e6786da91238ac91':
  recovery: Switch applypatch/ and updater/ to cpp.
2015-07-14 01:11:48 +00:00
Tao Bao 0bacbfd03c Merge "recovery: Switch applypatch/ and updater/ to cpp." 2015-07-14 01:00:27 +00:00
Tao Bao ba9a42aa7e recovery: Switch applypatch/ and updater/ to cpp.
Mostly trivial changes to make cpp compiler happy.

Change-Id: I69bd1d96fcccf506007f6144faf37e11cfba1270
2015-07-13 17:21:31 -07:00
Tao Bao f2853e2747 am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""
* commit '65c230f4b3c9fd6b42f6502b96e5b47c7b1c2f61':
  Revert "Zero blocks before BLKDISCARD"
2015-07-11 20:32:32 +00:00
Tao Bao 65c230f4b3 Merge "Revert "Zero blocks before BLKDISCARD"" 2015-07-11 20:20:39 +00:00
Tao Bao 9c67aa2d2b Revert "Zero blocks before BLKDISCARD"
This reverts commit b65f0272c8.

It slows down the update too much on some devices (e.g. increased
from 8 mins to 40 mins to take a full OTA update).

Bug: 22129621
Change-Id: I016e3b47313e3113f01bb4f8eb3c14856bdc35e5
(cherry picked from commit 7125f9594d)
2015-07-11 08:35:55 -07:00
Tao Bao 4e6507f328 am 2490dbc9: Merge "Allow mounting squashfs partitions"
* commit '2490dbc9325ad522ec5ee031f5493d2e975f3a49':
  Allow mounting squashfs partitions
2015-07-07 00:22:35 +00:00
Tao Bao 2490dbc932 Merge "Allow mounting squashfs partitions" 2015-07-07 00:15:48 +00:00
Mohamad Ayyash 522ea72116 Allow mounting squashfs partitions
Change-Id: Ifb8f84063a406db7aad3f9ef12c349ea09a54e07
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>

(cherry picked from commit 0ddfa329ac)
2015-07-06 22:01:25 +00:00
Tao Bao 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 Bao 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 Bao 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 Bao 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 Hughes 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 Hughes 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 Hughes 6dd443fd51 am ea13fe23: Merge "Allow sideloading without authentication."
* commit 'ea13fe233e8a95d9e5b69b131fbf840a60d1f04e':
  Allow sideloading without authentication.
2015-06-23 18:47:10 +00:00
Elliott Hughes 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 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
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 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 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
caozhiyuan b4effb9807 Unmount sdcard if no package file is selected.
Change-Id: I12b4f880802135a98dbc11a19e74172a3a5ef921
2015-06-10 16:46:56 +08: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