Tao Bao
2e979ef6fd
am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."
...
* commit '302779e71cb1be68f60cb044c85436d4d6bcfecc':
recovery: Allow "Mount /system" for system_root_image.
2015-07-31 16:49:33 +00:00
Tao Bao
302779e71c
Merge "recovery: Allow "Mount /system" for system_root_image."
2015-07-31 16:43:39 +00:00
Tao Bao
abb8f7785e
recovery: Allow "Mount /system" for system_root_image.
...
When system images contain the root directory, there is no entry of
"/system" in the fstab. Change it to look for "/" instead if
ro.build.system_root_image is true. We actually mount the partition
to /system_root instead, and create a symlink to /system_root/system
for /system. This allows "adb shell" to work properly.
Bug: 22855115
Change-Id: Ibac493a5a9320c98ee3b60bd2cc635b925f5454a
2015-07-30 17:22:29 -07:00
Tao Bao
7666f65b2a
am 62e19231: Merge "updater: Hoist fsync() to outer loop."
...
* commit '62e1923194de067c0ac589abcfc4f04fdddf2b1a':
updater: Hoist fsync() to outer loop.
2015-07-28 00:21:36 +00:00
Tao Bao
62e1923194
Merge "updater: Hoist fsync() to outer loop."
2015-07-28 00:12:31 +00:00
Tao Bao
187efff6f3
updater: Hoist fsync() to outer loop.
...
Currently the fsync() inside write_all() may be called multiple times
when performing a command. Move that to the outer loop and call it
only after completing the command.
Also remove the O_SYNC flag when writing a stash.
Change-Id: I71e51d76051a2f7f504eef1aa585d2cb7a000d80
2015-07-27 14:17:09 -07: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
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
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
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
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
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
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
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
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
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
6dd443fd51
am ea13fe23: Merge "Allow sideloading without authentication."
...
* commit 'ea13fe233e8a95d9e5b69b131fbf840a60d1f04e':
Allow sideloading without authentication.
2015-06-23 18:47:10 +00: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
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