Commit graph

1816 commits

Author SHA1 Message Date
Tao Bao
485b63702c recovery: Switch applypatch/ and updater/ to cpp.
Mostly trivial changes to make cpp compiler happy.

Change-Id: I1b0481465c67c3bbca35a839d0764190d84ff34e
(cherry picked from commit ba9a42aa7e)
2015-07-13 23:25:46 -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
Paul Lawrence
e93ab57167 am a91335ae: am 90c75b0b: Change init sequence to support file level encryption
* commit 'a91335aedcdf1eae07e82bb4f247616832f05928':
  Change init sequence to support file level encryption
2015-07-13 22:39:11 +00:00
Paul Lawrence
a91335aedc am 90c75b0b: Change init sequence to support file level encryption
* commit '90c75b0beb375b8d261e2df92292e9b542470f6e':
  Change init sequence to support file level encryption
2015-07-13 17:53:14 +00:00
Tao Bao
25c0cd38e0 am 79e95b2d: am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""
* commit '79e95b2d167becd93e7c456e5aa0c482edaeefcc':
  Revert "Zero blocks before BLKDISCARD"
2015-07-11 20:58:37 +00:00
Tao Bao
79e95b2d16 am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""
* commit 'f2853e27472728d3a24293ab4bfc445c74be6a15':
  Revert "Zero blocks before BLKDISCARD"
2015-07-11 20:47:00 +00: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
b32e439d04 am b6b31549: am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
* commit 'b6b31549dfe3c9ec6b32e2862ee7e08a949e2f9c':
  Revert "Change init sequence to support file level encryption"
2015-07-07 20:36:14 +00:00
Paul Lawrence
90c75b0beb 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-07 13:26:17 -07:00
Paul Lawrence
b6b31549df 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 18:20:23 +00: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
473bdd53cf am e93fa6b7: am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"
* commit 'e93fa6b7428a7bdd6386159b417d70090b20f2df':
  Allow mounting squashfs partitions
2015-07-07 03:23:04 +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
Paul Lawrence
dabc89e7b3 am 3cc51480: am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev
* commit '3cc5148007a7ad2ff0b868ae89c7835286dd148c':
  Change init sequence to support file level encryption
2015-07-07 00:32:07 +00:00
Tao Bao
e93fa6b742 am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"
* commit '4e6507f32817e2943b1f27d12f56b485993c2a44':
  Allow mounting squashfs partitions
2015-07-07 00:31:08 +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
3cc5148007 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 20:22:20 +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
19a211c146 am 08b63396: am 501282a4: am b4b41daa: am 0ddfa329: Allow mounting squashfs partitions
* commit '08b63396f9a2361a891f37831e20fda502b2afa4':
  Allow mounting squashfs partitions
2015-07-03 20:34:27 +00:00
Vincent Palatin
f09db68acb am 6284431d: am 8409b088: Merge "Add drm support to minui" into mnc-dev
* commit '6284431df56aff58a0ea46f06341d23cb9ff94cd':
  Add drm support to minui
2015-07-03 20:34:26 +00:00
Tao Bao
de9496d7d3 am c4b6f87f: am 7125f959: Revert "Zero blocks before BLKDISCARD"
* commit 'c4b6f87f7ab969be7ee177baa8704774869ecb56':
  Revert "Zero blocks before BLKDISCARD"
2015-07-03 05:36:51 +00: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
Vincent Palatin
8409b08888 Merge "Add drm support to minui" into mnc-dev 2015-07-01 23:24:55 +00:00
Stéphane Marchesin
1a92c4458d Add drm support to minui
Bug: 22231636

Change-Id: I103c8e906b7dd9862b7bb89d8642268e9a3006b4
Signed-off-by: Stéphane Marchesin <marcheu@chromium.org>
2015-07-01 15:27:48 -07:00
Tao Bao
c4b6f87f7a am 7125f959: Revert "Zero blocks before BLKDISCARD"
* commit '7125f9594db027ce4313d940ce2cafac67ae8c31':
  Revert "Zero blocks before BLKDISCARD"
2015-07-01 19:02:59 +00:00
Mohamad Ayyash
0ddfa329ac Allow mounting squashfs partitions
Change-Id: Ic023eb7d8a11e2a65172a23ff39fa902ef566183
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-07-01 10:13:16 -07:00
Tao Bao
7125f9594d 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: I4e8d4f6734967caf4f0d19c734027f7b6c107370
2015-06-30 23:10:44 -07:00
Tao Bao
f7d1ebeb4c am 2b3c599c: am c3dddce2: More accurate checking for overlapped ranges.
* commit '2b3c599c6a6b7c2cf8da3e6ad9ada5812df3f831':
  More accurate checking for overlapped ranges.
2015-06-26 22:14:11 +00:00
Tao Bao
2b3c599c6a am c3dddce2: More accurate checking for overlapped ranges.
* commit 'c3dddce205ef44933813394013ee5ef89b63653b':
  More accurate checking for overlapped ranges.
2015-06-26 21:54:55 +00:00
caozhiyuan
7dc8a75b64 am b102404d: am cb9450e1: Use f_bavail to calculate free space
* commit 'b102404d1defbfd3e63ca8f8721327f4384e2d69':
  Use f_bavail to calculate free space
2015-06-26 21:15:45 +00:00
caozhiyuan
b102404d1d am cb9450e1: Use f_bavail to calculate free space
* commit 'cb9450e11337700907a7a5ec290902196c74fa9b':
  Use f_bavail to calculate free space
2015-06-26 20:59:23 +00:00
Tao Bao
c3dddce205 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: I362d259f8b5d62478858ad0422b635bc5068698d
(cherry picked from commit c0f56ad766)
2015-06-26 13:48:46 -07:00
caozhiyuan
cb9450e113 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.

Bug: 22118089
Change-Id: I81c9531703298019a4fc11839f28d2cc8b9df34e
(cherry picked from commit 3b4977638f)
2015-06-26 11:17:02 -07:00
Tao Bao
744fb66659 am f90651e4: am 89d3634f: am b36d9c3f: Merge "More accurate checking for overlapped ranges."
* commit 'f90651e4c43ac9b803ca67582a3ffd5e8dc0f192':
  More accurate checking for overlapped ranges.
2015-06-26 00:50:39 +00:00
Tao Bao
f90651e4c4 am 89d3634f: am b36d9c3f: Merge "More accurate checking for overlapped ranges."
* commit '89d3634ffe0855456fe4b33b6aa2abdffeeddfc6':
  More accurate checking for overlapped ranges.
2015-06-26 00:36:51 +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