Tao Bao
2ecdc8948d
am ddbfdf79: am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."
...
* commit 'ddbfdf79518699b232837bae1052e70b701bd524':
udpater: Call fsync() after rename().
2015-08-04 18:49:36 +00:00
Tao Bao
ddbfdf7951
am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."
...
* commit '393d1e739fc10e526bd3b7b83836a266bfa24079':
udpater: Call fsync() after rename().
2015-08-04 18:42:12 +00:00
Tao Bao
393d1e739f
am 27c1ab20: Merge "udpater: Call fsync() after rename()."
...
* commit '27c1ab2095f25253d0920eb6afe7cd2791a708dc':
udpater: Call fsync() after rename().
2015-08-04 18:33:00 +00:00
Tao Bao
27c1ab2095
Merge "udpater: Call fsync() after rename()."
2015-08-04 18:24:53 +00:00
Tao Bao
dc3922622a
udpater: Call fsync() after rename().
...
We need to ensure the renamed filename reaches the underlying storage.
Bug: 22840552
Change-Id: Ide2e753a2038691d472b6ee173cbf68ac998a084
2015-08-03 21:35:05 -07:00
Tao Bao
d9101adc4b
am 414c576c: am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."
...
* commit '414c576cf8fb5a8defef40d72f6c75012acdecab':
recovery: Allow "Mount /system" for system_root_image.
2015-08-01 15:52:44 +00:00
Tao Bao
414c576cf8
am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."
...
* commit '2e979ef6fd21e1681a8ec7ca2f5582ca8e14ddcd':
recovery: Allow "Mount /system" for system_root_image.
2015-08-01 15:47:48 +00:00
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
14df07dd18
am 7d71725d: am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."
...
* commit '7d71725d7667afa6b705fe0e20151e03d9db75d2':
updater: Hoist fsync() to outer loop.
2015-07-28 18:46:05 +00:00
Tao Bao
7d71725d76
am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."
...
* commit '7666f65b2a1e4352c52df9fe7a0b26ce923a1477':
updater: Hoist fsync() to outer loop.
2015-07-28 00:34:59 +00: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
14c63c9567
am 4b3ad009: am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."
...
* commit '4b3ad009f7a1dd0ac85d996d9f3a87a6a83b0e97':
applypatch: Fix the checking in WriteToPartition().
2015-07-25 01:21:43 +00:00
Tao Bao
4b3ad009f7
am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."
...
* commit '0622ccb34d504170b76b8f4dd5f0639794be679a':
applypatch: Fix the checking in WriteToPartition().
2015-07-25 01:03:22 +00: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
65b0c8891f
am 6a06034d: am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."
...
* commit '6a06034d031464b220bc78bda2654f80d6ef1ad1':
applypatch: Support flash mode.
2015-07-24 21:27:04 +00:00
Tao Bao
6a06034d03
am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."
...
* commit '3b753ad5da2ade45548f95b4a76219db3043db49':
applypatch: Support flash mode.
2015-07-24 21:10:46 +00:00
Tao Bao
8749d238bf
am e657f0fb: am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."
...
* commit 'e657f0fb8ec21b09831ed19d18ba05a7630a4fb0':
uncrypt: Support file level encryption.
2015-07-24 20:33:22 +00:00
Tao Bao
a6b3c540ad
am 3f640620: am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."
...
* commit '3f6406204c9886ee59209a98e1bb8b64ae615656':
updater: libapplypatch needs libbase now.
2015-07-24 20:33:21 +00:00
Tao Bao
990c308ab5
resolved conflicts for merge of 49a24460 to master
2015-07-24 13:29:09 -07:00
Tao Bao
82a4aa7f93
am 052796ea: am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."
...
* commit '052796ea09bcf33f7031aa8218628bf1c9ced02a':
recovery: Switch fuse_* to C++.
2015-07-24 20:06:54 +00:00
Tao Bao
ef37ee0457
am 0d4e0026: recovery: Switch fuse_* to C++.
...
* commit '0d4e002670064157aa34ba8c391184151b7d402a':
recovery: Switch fuse_* to C++.
2015-07-24 18:58:41 +00: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
e657f0fb8e
am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."
...
* commit 'c69095d8cd9685f9d9c7e3863a5e087efeadba3a':
uncrypt: Support file level encryption.
2015-07-24 18:33:22 +00:00
Tao Bao
3f6406204c
am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."
...
* commit '87f2c673dfbc310d1a80ea1c3b00d9e1adb1947f':
updater: libapplypatch needs libbase now.
2015-07-24 18:33:21 +00:00
Tao Bao
49a24460a4
am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."
...
* commit '1dc71bec8d3dc3c1eb7eb40aed2eeb04b47f75ce':
applypatch: Refactor strtok().
2015-07-24 18:33:20 +00:00
Tao Bao
052796ea09
am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."
...
* commit 'b91e700544e0fca378a7fb5f8c807842bb284986':
recovery: Switch fuse_* to C++.
2015-07-24 18:33:19 +00:00
Tao Bao
0d4e002670
recovery: Switch fuse_* to C++.
...
Change-Id: Id50c3e6febd0ab61f10a654b9b265cf21a2d1701
(cherry picked from commit 71dc365f25 )
2015-07-24 11:22:05 -07: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
68c5a67967
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: I345eaaee269f6443527f45a9be7e4ee47f6b2b39
2015-07-21 17:43:42 -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
ee4efc4d3e
Merge "updater: libapplypatch needs libbase now."
2015-07-17 20:45:32 +00:00
Tao Bao
1b1ea17d55
updater: libapplypatch needs libbase now.
...
Change-Id: Ibe3173edd6274b61bd9ca5ec394d7f6b4a403639
2015-07-17 13:39:52 -07:00