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

1570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao cb0e7f2da0 am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." 
* commit '0622ccb34d504170b76b8f4dd5f0639794be679a':
  applypatch: Fix the checking in WriteToPartition().
 2015-07-24 23:29:48 +00:00
Tao Bao 0622ccb34d am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()." 
* commit '6a4a33e39ea2fa8626335f6b9cccf407c71c0588':
  applypatch: Fix the checking in WriteToPartition().
 2015-07-24 23:08:59 +00:00
Tao Bao 6a4a33e39e Merge "applypatch: Fix the checking in WriteToPartition()." 2015-07-24 22:56:36 +00:00
Tao Bao 1ce7a2a63d applypatch: Fix the checking in WriteToPartition(). 
WriteToPartition() should consider a target name as valid if it contains
multiple colons. But only the first two fields will be used.

Bug: 22725128
Change-Id: Ie9404375e24045c115595eec6ce5b6423da8fc3e
 2015-07-24 15:33:35 -07:00
Tao Bao 3318523354 am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode." 
* commit '3b753ad5da2ade45548f95b4a76219db3043db49':
  applypatch: Support flash mode.
 2015-07-24 21:02:53 +00:00
Tao Bao f0654b4414 am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." 
* commit 'c69095d8cd9685f9d9c7e3863a5e087efeadba3a':
  uncrypt: Support file level encryption.
 2015-07-24 21:02:50 +00:00
Tao Bao 7665d443e2 am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now." 
* commit '87f2c673dfbc310d1a80ea1c3b00d9e1adb1947f':
  updater: libapplypatch needs libbase now.
 2015-07-24 21:02:49 +00:00
Tao Bao 5040636abd am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()." 
* commit '1dc71bec8d3dc3c1eb7eb40aed2eeb04b47f75ce':
  applypatch: Refactor strtok().
 2015-07-24 21:02:48 +00:00
Tao Bao 596219d9c2 am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++." 
* commit 'b91e700544e0fca378a7fb5f8c807842bb284986':
  recovery: Switch fuse_* to C++.
 2015-07-24 21:02:48 +00:00
Tao Bao 3b753ad5da am dd738c11: Merge "applypatch: Support flash mode." 
* commit 'dd738c11a49d594183dde9f0e46f56c7a575900a':
  applypatch: Support flash mode.
 2015-07-24 18:33:57 +00:00
Tao Bao c69095d8cd am afb8f320: Merge "uncrypt: Support file level encryption." 
* commit 'afb8f320bf244630035e011f7840f90120ec4f8f':
  uncrypt: Support file level encryption.
 2015-07-24 18:18:42 +00:00
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 dd738c11a4 Merge "applypatch: Support flash mode." 2015-07-24 18:17:49 +00:00
Tao Bao abba55b4c5 applypatch: Support flash mode. 
We may carry a full copy of recovery image in the /system, and use
/system/bin/install-recovery.sh to install the recovery. This CL adds
support to flash the recovery partition with the given image.

Bug: 22641135
Change-Id: I7a275b62fdd1bf41f97f6aab62d0200f7dae5aa1
(cherry picked from commit 68c5a67967)
 2015-07-24 11:15:19 -07:00
Tao Bao afb8f320bf Merge "uncrypt: Support file level encryption." 2015-07-24 18:13:58 +00:00
Tao Bao 7cf50c60b5 uncrypt: Support file level encryption. 
Bug: 22534003
Change-Id: I2bc22418c416491da573875dce78daed24f2c046
(cherry picked from commit 6e9dda70cb)
 2015-07-24 11:13:25 -07: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 0e7368a505 am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions." 
* commit '328cb8cb5a434ba9d897443a408d11e8ee8c64a0':
  Clean up LOG functions.
 2015-07-17 05:37:49 +00: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 3231c7ca7f am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp." 
* commit '307eecfdc7dc73ce8f53f742e3c468e63b42f0e2':
  recovery: Switch applypatch/ and updater/ to cpp.
 2015-07-14 22:52:24 +00: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 5391dfdb35 am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD"" 
* commit 'f2853e27472728d3a24293ab4bfc445c74be6a15':
  Revert "Zero blocks before BLKDISCARD"
 2015-07-11 20:45:03 +00: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
Paul Lawrence 1915dd56e3 am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev 
* commit '10cf0942a7f4b2bfd539416e4767aaaf866a6527':
  Revert "Change init sequence to support file level encryption"
 2015-07-07 17:38:57 +00:00
Paul Lawrence 10cf0942a7 Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev 2015-07-07 17:29:02 +00:00
Paul Lawrence 392879eec0 Revert "Change init sequence to support file level encryption" 
This reverts commit 98c1a3de23.

Change-Id: I524060418de18f97c3865ebc4435f501015e92ee
 2015-07-07 17:05:39 +00:00
Tao Bao 2fc4d4359b am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions" 
* commit '4e6507f32817e2943b1f27d12f56b485993c2a44':
  Allow mounting squashfs partitions
 2015-07-07 00:32:14 +00: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
Paul Lawrence 7624d0d830 am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev 
* commit 'd6b2b65dc40c5af7feecf634b8ae55bf14fe8e6c':
  Change init sequence to support file level encryption
 2015-07-06 19:47:31 +00:00
Paul Lawrence d6b2b65dc4 Merge "Change init sequence to support file level encryption" into mnc-dev 2015-07-06 19:33:28 +00:00
Paul Lawrence 98c1a3de23 Change init sequence to support file level encryption 
File level encryption must get the key between mounting userdata and
calling post_fs_data when the directories are created. This requires
access to keymaster, which in turn is found from a system property.

Split property loaded into system and data, and load in right order.

Bug: 22233063
Change-Id: I409c12e3f4a8cef474eb48818e96760fe292cc49
 2015-07-06 10:44:33 -07:00
Mohamad Ayyash 08b63396f9 am 501282a4: am b4b41daa: am 0ddfa329: Allow mounting squashfs partitions 
* commit '501282a42dfbd9f4d33a1009daa387d1d0f0f368':
  Allow mounting squashfs partitions
 2015-07-02 01:09:46 +00:00
Vincent Palatin 6284431df5 am 8409b088: Merge "Add drm support to minui" into mnc-dev 
* commit '8409b08888d5ec914d7b4aae552bc78f23bcddd5':
  Add drm support to minui
 2015-07-02 00:58:36 +00:00
Mohamad Ayyash 501282a42d am b4b41daa: am 0ddfa329: Allow mounting squashfs partitions 
* commit 'b4b41daa2ddbe8849dacdeeafd240e2a265cb594':
  Allow mounting squashfs partitions
 2015-07-02 00:47:06 +00:00
Mohamad Ayyash b4b41daa2d am 0ddfa329: Allow mounting squashfs partitions 
* commit '0ddfa329acb1e6464fe5d66b58257013abf21116':
  Allow mounting squashfs partitions
 2015-07-02 00:30:57 +00:00