Commit Graph

1572 Commits

Author SHA1 Message Date
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
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
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 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 Bao 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 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 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 Hughes 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 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 3a9eb9a207 am 997534d0: am c35f3ce3: Allow sideloading without authentication.
* commit '997534d0efcdb9145fbc58f78cb3409db8d04804':
  Allow sideloading without authentication.
2015-06-23 22:21:36 +00:00
Elliott Hughes 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 Hughes 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 Hughes 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 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 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 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 874e0c03da am deb4ebb2: am d2a59288: am 22ccc87a: Merge "Unmount sdcard if no package file is selected."
* commit 'deb4ebb2876b0352ddf042f680339696b89ec125':
  Unmount sdcard if no package file is selected.
2015-06-11 05:54:55 +00:00
Elliott Hughes 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
Sami Tolvanen debe2dbe4c am 7ccec497: am d7c9bf41: Merge "Zero blocks before BLKDISCARD" into mnc-dev
* commit '7ccec497f293e1e2629ecb9c906de69305976ff7':
  Zero blocks before BLKDISCARD
2015-06-11 01:33:30 +00:00
Elliott Hughes 39edb1b502 am 1e8bc40b: am 0005f89c: Split WipeData into PreWipeData and PostWipeData.
* commit '1e8bc40b02e372403ba58e4681952347bea3fb34':
  Split WipeData into PreWipeData and PostWipeData.
2015-06-11 01:33:29 +00: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
Sami Tolvanen 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 Hughes 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 Hughes 07069f080e am 12c8ea68: am e21ff08e: am a1009c34: Merge "Split WipeData into PreWipeData and PostWipeData."
* commit '12c8ea6827f2de5b4376524790dd9d2c9d6ef6ad':
  Split WipeData into PreWipeData and PostWipeData.
2015-06-10 22:58:00 +00:00
Elliott Hughes 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 Tolvanen d7c9bf41da Merge "Zero blocks before BLKDISCARD" into mnc-dev 2015-06-10 21:50:03 +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 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 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 abb78773a7 am a66cdf40: am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD"
* commit 'a66cdf40c3d9ee8248049ce076673e3fe96a7080':
  Zero blocks before BLKDISCARD
2015-06-10 20:54:03 +00:00
Sami Tolvanen 2cfa4d446b am 11cad65d: am 059e391f: am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD""
* commit '11cad65d2a2b829d5bae02589c6f1d167cf4e53f':
  Revert "Zero blocks before BLKDISCARD"
2015-06-10 20:54:02 +00:00
Sami Tolvanen a66cdf40c3 am 915fc970: am 280cb6e9: Merge "Zero blocks before BLKDISCARD"
* commit '915fc970d1a5181496f846cd8673716966ddf6fb':
  Zero blocks before BLKDISCARD
2015-06-10 20:36:51 +00:00
Sami Tolvanen 11cad65d2a am 059e391f: am e6f6097a: Merge "Revert "Zero blocks before BLKDISCARD""
* commit '059e391f9eac7fd2d152da79fbfac9b0bb5a2fad':
  Revert "Zero blocks before BLKDISCARD"
2015-06-10 20:36:23 +00:00
Sami Tolvanen b65f0272c8 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
(cherry picked from commit a3c75e3ea6)
2015-06-10 20:36:02 +01: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 bb92714641 am 758f56ef: am 6abd52f6: Revert "Zero blocks before BLKDISCARD"
* commit '758f56efd5401e508fecfd1ad26813ab3e5f3df8':
  Revert "Zero blocks before BLKDISCARD"
2015-06-10 17:13:42 +00:00
Sami Tolvanen 758f56efd5 am 6abd52f6: Revert "Zero blocks before BLKDISCARD"
* commit '6abd52f62be24981398a99ebefc8717eb2294f97':
  Revert "Zero blocks before BLKDISCARD"
2015-06-10 16:13:10 +00:00