PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,531 Commits 1 Branch 0 Tags
2fc4d4359b268cbf3d0f73d670a219f12d440e86
Commit Graph
1531 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao BaoandAndroid Git Automerger 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 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 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 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 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 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 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 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 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 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 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 687bf071ad am 6dd443fd: am ea13fe23: Merge "Allow sideloading without authentication." 
* commit '6dd443fd51062efb4eae87b8f0e1f6cebf332b37':
  Allow sideloading without authentication.
 2015-06-23 18:58:47 +00: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 Hughes c35f3ce30e Allow sideloading without authentication. 
Bug: http://b/22025550
Change-Id: I20f09ae442536f924f19ede0abf6a2bcc0a5cedf
(cherry picked from commit 9813f5ba57)
 2015-06-23 11:34:07 -07: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 deb4ebb287 am d2a59288: am 22ccc87a: Merge "Unmount sdcard if no package file is selected." 
* commit 'd2a592888b1c8103b7d5c4807230102b78aa3d23':
  Unmount sdcard if no package file is selected.
 2015-06-11 02:31:41 +00: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
Sami TolvanenandAndroid Git Automerger 7ccec497f2 am d7c9bf41: Merge "Zero blocks before BLKDISCARD" into mnc-dev 
* commit 'd7c9bf41daa865ca016dee12a68282ba457c31fb':
  Zero blocks before BLKDISCARD
 2015-06-10 23:17:32 +00:00
Elliott HughesandAndroid Git Automerger 1e8bc40b02 am 0005f89c: Split WipeData into PreWipeData and PostWipeData. 
* commit '0005f89c31dfc2ca9053512900571620a0eba842':
  Split WipeData into PreWipeData and PostWipeData.
 2015-06-10 23:16:36 +00:00
Elliott HughesandAndroid Git Automerger 12c8ea6827 am e21ff08e: am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData." 
* commit 'e21ff08ea6a94bcd751a3cb0e6123275e0f18a2b':
  Split WipeData into PreWipeData and PostWipeData.
 2015-06-10 22:47:51 +00:00
Sami TolvanenandAndroid (Google) Code Review d7c9bf41da Merge "Zero blocks before BLKDISCARD" into mnc-dev 2015-06-10 21:50:03 +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 Hughes 0005f89c31 Split WipeData into PreWipeData and PostWipeData. 
Bug: http://b/21760064
Change-Id: Idde268fe4d7e27586ca4469de16783f1ffdc5069
(cherry picked from commit 945548ef7b)
 2015-06-10 14:11:08 -07: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 a66cdf40c3 am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD" 
* commit '915fc970d1a5181496f846cd8673716966ddf6fb':
  Zero blocks before BLKDISCARD
 2015-06-10 20:36:51 +00:00