PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,600 Commits 1 Branch 0 Tags
b32e439d04ba408a34dcc7b96bfa9a395fed1e34
Commit Graph
1600 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul LawrenceandAndroid Git Automerger 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 LawrenceandAndroid Git Automerger 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 LawrenceandAndroid (Google) Code Review 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 BaoandAndroid Git Automerger 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
Paul LawrenceandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 4e6507f328 am 2490dbc9: Merge "Allow mounting squashfs partitions" 
* commit '2490dbc9325ad522ec5ee031f5493d2e975f3a49':
  Allow mounting squashfs partitions
 2015-07-07 00:22:35 +00:00
Tao BaoandGerrit Code Review 2490dbc932 Merge "Allow mounting squashfs partitions" 2015-07-07 00:15:48 +00:00
Mohamad AyyashandTao Bao 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 LawrenceandAndroid Git Automerger 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 LawrenceandAndroid (Google) Code Review 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 AyyashandAndroid Git Automerger 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 PalatinandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 AyyashandAndroid Git Automerger 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 PalatinandAndroid Git Automerger 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 AyyashandAndroid Git Automerger 501282a42d am b4b41daa: am 0ddfa329: Allow mounting squashfs partitions 
* commit 'b4b41daa2ddbe8849dacdeeafd240e2a265cb594':
  Allow mounting squashfs partitions
 2015-07-02 00:47:06 +00:00
Mohamad AyyashandAndroid Git Automerger b4b41daa2d am 0ddfa329: Allow mounting squashfs partitions 
* commit '0ddfa329acb1e6464fe5d66b58257013abf21116':
  Allow mounting squashfs partitions
 2015-07-02 00:30:57 +00:00
Vincent PalatinandAndroid (Google) Code Review 8409b08888 Merge "Add drm support to minui" into mnc-dev 2015-07-01 23:24:55 +00:00
Stéphane MarchesinandVincent Palatin 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 BaoandAndroid Git Automerger c4b6f87f7a am 7125f959: Revert "Zero blocks before BLKDISCARD" 
* commit '7125f9594db027ce4313d940ce2cafac67ae8c31':
  Revert "Zero blocks before BLKDISCARD"
 2015-07-01 19:02:59 +00:00
Mohamad AyyashandSimon Wilson 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 BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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
caozhiyuanandAndroid Git Automerger 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
caozhiyuanandAndroid Git Automerger 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
caozhiyuanandTao Bao 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 BaoandAndroid Git Automerger 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 BaoandAndroid Git Automerger 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 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 377635257a am 8f7a2afe: am 1572820c: am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices" 
* commit '8f7a2afede744f548ea13761ae6eb27327485a35':
  recovery: Use xxhdpi resources for 560dpi devices
 2015-06-24 20:08:56 +00:00
Tao BaoandAndroid Git Automerger 8f7a2afede am 1572820c: am ec18d495: Merge "recovery: Use xxhdpi resources for 560dpi devices" 
* commit '1572820cd005c8b150c1c807b1b686d8f2da78ad':
  recovery: Use xxhdpi resources for 560dpi devices
 2015-06-24 19:55:10 +00: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 e1d9fc46f3 am 2c7fa669: am 4b619469: am 719e4e5d: Merge "Just use fstat in sysMapFile." 
* commit '2c7fa6695e3c04810a9cca0619cae5b928a717dd':
  Just use fstat in sysMapFile.
 2015-06-24 01:13:44 +00:00
Elliott HughesandAndroid Git Automerger 2c7fa6695e am 4b619469: am 719e4e5d: Merge "Just use fstat in sysMapFile." 
* commit '4b6194696e3fdb9e0bab5dc53d91c3bca9267123':
  Just use fstat in sysMapFile.
 2015-06-24 00:59:58 +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 HughesandAndroid Git Automerger 3a9eb9a207 am 997534d0: am c35f3ce3: Allow sideloading without authentication. 
* commit '997534d0efcdb9145fbc58f78cb3409db8d04804':
  Allow sideloading without authentication.
 2015-06-23 22:21:36 +00:00
Elliott HughesandAndroid Git Automerger 997534d0ef am c35f3ce3: Allow sideloading without authentication. 
* commit 'c35f3ce30e4bb0de33fe6fcf0b928d0e4b7269b0':
  Allow sideloading without authentication.
 2015-06-23 21:05:54 +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 f73a73443c am 687bf071: am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication." 
* commit '687bf071ad5f19a1fe91569f47e474e6e9a239d7':
  Allow sideloading without authentication.
 2015-06-23 19:12:14 +00:00
Elliott HughesandAndroid Git Automerger 687bf071ad am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication." 
* commit '6dd443fd51062efb4eae87b8f0e1f6cebf332b37':
  Allow sideloading without authentication.
 2015-06-23 18:58:47 +00:00