Narayan Kamath
ec4b58ad8a
am ec63d564
: Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
* commit 'ec63d564a86ad5b30f75aa307b4bd271f6a96a56':
Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-10 18:26:12 +00:00
Tao Bao
0cf19d9ba1
am 7a677807
: Merge "updater: Fix the line breaks in ui_print commands."
...
* commit '7a6778078b2525c245869061366eb1f92942542a':
updater: Fix the line breaks in ui_print commands.
2015-09-10 17:31:11 +00:00
Tao Bao
7a6778078b
Merge "updater: Fix the line breaks in ui_print commands."
2015-09-10 17:23:26 +00:00
Tao Bao
1107d96746
updater: Fix the line breaks in ui_print commands.
...
When processing ui_print commands in the updater, it misses a line break
when printing to the recovery log.
Also clean up uiPrintf() and UIPrintFn() with std::string's.
Change-Id: Ie5dbbfbc40b024929887d3c3ccd3a334249a8c9d
2015-09-10 10:17:56 -07:00
Tao Bao
612336ddc1
updater: Manage buffers with std::vector.
...
Change-Id: Ide489e18dd8daf161b612f65b28921b61cdd8d8d
2015-09-09 17:44:23 -07:00
Tao Bao
272d268c17
am 50828f58
: am e520f1d4
: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."
...
* commit '50828f58caf1ee8f905c67f85c4dccd4a4f3304b':
updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
2015-09-09 18:09:21 +00:00
Tao Bao
50828f58ca
am e520f1d4
: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."
...
* commit 'e520f1d4cddeca4208ccc385313d900581ff117c':
updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
2015-09-09 18:02:21 +00:00
Tao Bao
e520f1d4cd
Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."
2015-09-09 17:54:40 +00:00
Narayan Kamath
ec63d564a8
Track usage of Vector / SortedVector from libutils DO NOT MERGE
...
bug: 22953624
Change-Id: Ifcc17e39433ac91ca41da5d336fb3006dfbb65a8
2015-09-09 10:42:10 +00:00
Tao Bao
34847b2c70
updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
...
And inline the call to LoadSrcTgtVersion1() into SaveStash().
Change-Id: Ibf4ef2bfa2cc62df59c4e8de99fd7d8039e71ecf
2015-09-08 11:08:00 -07:00
Tao Bao
d4547c1dda
am e5571a0f
: am 585a50ce
: Merge "imgdiff: fix file descriptor leak"
...
* commit 'e5571a0ff8217a6fe1b3defdb22295596e36c280':
imgdiff: fix file descriptor leak
2015-09-08 17:54:19 +00:00
Tao Bao
e5571a0ff8
am 585a50ce
: Merge "imgdiff: fix file descriptor leak"
...
* commit '585a50cecbccf59666dd65e9fc4320eaa3511634':
imgdiff: fix file descriptor leak
2015-09-08 17:46:31 +00:00
Tao Bao
585a50cecb
Merge "imgdiff: fix file descriptor leak"
2015-09-08 17:40:27 +00:00
Jeremy Compostella
a91c66d7c1
imgdiff: fix file descriptor leak
...
mkstemp() allocates a file description that is never released. If
MakePatch() is called too many time, imgdiff reaches the Operating
System EMFILE (too many open files) limit.
Change-Id: Icbe1399f6f6d32cfa1830f879cacf7d75bbd9fc3
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
2015-09-08 19:15:09 +02:00
Tom Cherry
1e8e6a8394
am cf11a160
: am f8c303f9
: Merge "move uncrypt from init.rc to uncrypt.rc"
...
* commit 'cf11a1601522c669c6df2095d71601546cc7fc7f':
move uncrypt from init.rc to uncrypt.rc
2015-09-04 18:02:34 +00:00
Tom Cherry
cf11a16015
am f8c303f9
: Merge "move uncrypt from init.rc to uncrypt.rc"
...
* commit 'f8c303f9c197ed9247dbc88a5bf392f1f2c65639':
move uncrypt from init.rc to uncrypt.rc
2015-09-04 17:56:28 +00:00
Tom Cherry
f8c303f9c1
Merge "move uncrypt from init.rc to uncrypt.rc"
2015-09-04 16:51:30 +00:00
David Pursell
c3d4d53546
minadbd: update service_to_fd() signature.
...
No functional change, just matching the signature to an adb change. See
https://android-review.googlesource.com/#/c/169601/ .
Change-Id: Ic826864e126054849b3a4d193ded8acc5ee5269c
2015-09-03 16:41:42 -07:00
Tom Cherry
daa6d04434
move uncrypt from init.rc to uncrypt.rc
...
Move uncrypt from /init.rc to /system/etc/init/uncrypt.rc using the
LOCAL_INIT_RC mechanism
Bug 23186545
Change-Id: Ib8cb6dffd2212f524298279787fd557bc84aa7b9
2015-09-03 16:32:54 -07:00
Tao Bao
834c92b7b1
am 8e9c6801
: recovery: Fix the bug that truncates menu entries.
...
* commit '8e9c68019f9c284b89155c71922ad8ac84af6ab6':
recovery: Fix the bug that truncates menu entries.
2015-09-03 17:21:02 +00:00
David Zeuthen
ceb81e4931
am 1b3195cb
: am 4c223f4e
: Merge "Add slot_suffix field to struct bootloader_message."
...
* commit '1b3195cb917dcaff5d563d3e17e497b855442461':
Add slot_suffix field to struct bootloader_message.
2015-09-03 15:28:15 +00:00
David Zeuthen
1b3195cb91
am 4c223f4e
: Merge "Add slot_suffix field to struct bootloader_message."
...
* commit '4c223f4e396e1b66a945601561fce4cd63fc31ae':
Add slot_suffix field to struct bootloader_message.
2015-09-03 15:17:39 +00:00
David Zeuthen
4c223f4e39
Merge "Add slot_suffix field to struct bootloader_message."
2015-09-03 15:10:55 +00:00
Tao Bao
31dde162b6
am 6f1f2062
: am 6997c287
: Merge "updater: Clean up C codes."
...
* commit '6f1f20622e269a4118e73c8da71a235b01924fee':
updater: Clean up C codes.
2015-09-03 00:39:10 +00:00
Tao Bao
6f1f20622e
am 6997c287
: Merge "updater: Clean up C codes."
...
* commit '6997c287bedbd32fb5ffb84fc2efd081e6f56d3e':
updater: Clean up C codes.
2015-09-03 00:32:04 +00:00
Tao Bao
6997c287be
Merge "updater: Clean up C codes."
2015-09-02 21:45:36 +00:00
Tao Bao
8e9c68019f
recovery: Fix the bug that truncates menu entries.
...
When there are 20 entries (like 10 last_log* and 10 last_kmg* in "view
recovery logs"), there's no "Back" entry. Because the number of entries
(21) exceeds text_rows (20) in WearRecoveryUI::StartMenu(). Since we
have scrollable menu, having more entries than text_rows won't be an
issue.
Bug: 23752519
Change-Id: I12573d7a34852a1a3d130c9e88522cee737eb08f
2015-09-02 14:38:23 -07:00
David Zeuthen
d85ae79dc9
Add slot_suffix field to struct bootloader_message.
...
This is needed by fs_mgr for certain A/B implementations.
Change-Id: I7bb404d61198eb7a962c2b693911f5156745daae
2015-09-02 15:49:58 -04:00
Tao Bao
0940fe17b0
updater: Clean up C codes.
...
Replace C-string with std::string, pointers with references, and
variable-size arrays in struct with std::vector.
Change-Id: I57f361a0e58286cbcd113e9be225981da56721b2
2015-09-01 12:57:35 -07:00
Tao Bao
d845a2d1ea
am 73468ee8
: (-s ours) am 5a16eba2
: am eef99138
: Merge "updater: Remove the unused isunresumable in SaveStash()."
...
* commit '73468ee8fb5b152b3c8be19ade89e9a31d733316':
2015-08-27 03:38:50 +00:00
Tao Bao
5e3a40f934
am 304c65b8
: (-s ours) am dc61d17d
: am 50c17f9d
: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
...
* commit '304c65b8fc2e80c0337454320f23582e357bca1c':
2015-08-27 03:38:49 +00:00
Tao Bao
1a42ebc16e
am 822685a8
: (-s ours) am dbbdcf3f
: am 93fa4b67
: Merge "edify: Switch to C++."
...
* commit '822685a8648e91aca6ce35992087c18165d4d609':
2015-08-27 03:38:49 +00:00
Tao Bao
b13fe892d8
am a9a50fef
: (-s ours) am 4854e292
: am ad509fd4
: Merge "Fix potential crash"
...
* commit 'a9a50fef97d388ef5fb06a5953caaa79ab16496d':
2015-08-27 03:38:48 +00:00
Tao Bao
dffdd5eb6d
am 06e6ccb9
: (-s ours) am 434a1761
: am 0d46c7ab
: Merge "Use unique_ptr and unique_fd to manager FDs."
...
* commit '06e6ccb98ab7b557e98a41af562ca515714e776a':
2015-08-27 03:38:47 +00:00
Tao Bao
85afda1752
am b65a9023
: (-s ours) am 7f89389a
: am 7c511184
: Merge "updater: Clean up char* with std::string."
...
* commit 'b65a90235e7d4fc3a2dbf68bb73ac323a88f1abc':
2015-08-27 03:38:47 +00:00
Dan Albert
85a77d2abe
am c2e91625
: (-s ours) am 236b3eb6
: am e67104a6
: Merge "Use CPPFLAGS instead of CFLAGS."
...
* commit 'c2e91625a7333ae993bab4c7069f25c2e9ecc8d3':
2015-08-27 03:38:46 +00:00
Elliott Hughes
34fa6d3891
am 8fa0007a
: (-s ours) am a9390df6
: am 06689dc5
: Merge "Fix recovery image build."
...
* commit '8fa0007a3eb59174f7c2fbf40a2a972dfb344531':
2015-08-27 03:38:45 +00:00
Tao Bao
371ab9058e
am 7daa48e6
: (-s ours) resolved conflicts for merge of be19dce8
to mnc-dev-plus-aosp
...
* commit '7daa48e62fa0ba002cffeddf8d520426a52d69a7':
2015-08-27 03:38:43 +00:00
Tao Bao
ea5d8f0aff
am 0e2efab3
: (-s ours) am 393d1e73
: am 27c1ab20
: Merge "udpater: Call fsync() after rename()."
...
* commit '0e2efab34546e1678855c979f06f0f56f4f38eb0':
2015-08-27 03:38:36 +00:00
Tao Bao
3fd097f8a8
am 854ae7f9
: (-s ours) am 2e979ef6
: am 302779e7
: Merge "recovery: Allow "Mount /system" for system_root_image."
...
* commit '854ae7f9ba8981e0122549dceae9b371ad4f7be1':
2015-08-27 03:38:35 +00:00
Tao Bao
77de478325
am f3f27990
: (-s ours) am 7666f65b
: am 62e19231
: Merge "updater: Hoist fsync() to outer loop."
...
* commit 'f3f27990f23a338c02a52bea713bf391e7994028':
2015-08-27 03:38:33 +00:00
Tao Bao
05c4b53eb5
am cb0e7f2d
: (-s ours) am 0622ccb3
: am 6a4a33e3
: Merge "applypatch: Fix the checking in WriteToPartition()."
...
* commit 'cb0e7f2da04b7dcaef50ec7a942cd5b5e64b4823':
2015-08-27 03:38:33 +00:00
Tao Bao
f6bebbd72c
am 33185233
: (-s ours) am 3b753ad5
: am dd738c11
: Merge "applypatch: Support flash mode."
...
* commit '33185233541dda72af3fd8a1fc1786251c88e122':
2015-08-27 03:38:30 +00:00
Tao Bao
d37f91d18d
am f0654b44
: (-s ours) am c69095d8
: am afb8f320
: Merge "uncrypt: Support file level encryption."
...
* commit 'f0654b4414c750703f50d4e84319d31d57e86284':
2015-08-27 03:38:29 +00:00
Tao Bao
c73e18f0a4
am 7665d443
: (-s ours) am 87f2c673
: am cc3c3414
: Merge "updater: libapplypatch needs libbase now."
...
* commit '7665d443e2e3de775661068c29df38581476cc71':
2015-08-27 03:38:28 +00:00
Tao Bao
f075f9a17a
am 5040636a
: (-s ours) am 1dc71bec
: am cfd9d9c7
: Merge "applypatch: Refactor strtok()."
...
* commit '5040636abd451e4e45227493f328f1cda39a5177':
2015-08-27 03:38:27 +00:00
Tao Bao
ca66fc1cb2
am 596219d9
: (-s ours) am b91e7005
: am 85090d0c
: Merge "recovery: Switch fuse_* to C++."
...
* commit '596219d9c2ea760a473c9f90bfa0317c326913af':
2015-08-27 03:38:26 +00:00
Tao Bao
d33e21a7ae
am 0e7368a5
: (-s ours) am 328cb8cb
: am 025c0e79
: Merge "Clean up LOG functions."
...
* commit '0e7368a505f647a07cf3b6b93622b48ef27c3f45':
2015-08-27 03:38:24 +00:00
Tao Bao
9da33c6765
am 3231c7ca
: (-s ours) am 307eecfd
: am 0bacbfd0
: Merge "recovery: Switch applypatch/ and updater/ to cpp."
...
* commit '3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f':
2015-08-27 03:38:23 +00:00
Tao Bao
f0e341b449
am 5391dfdb
: (-s ours) am f2853e27
: am 65c230f4
: Merge "Revert "Zero blocks before BLKDISCARD""
...
* commit '5391dfdb35221f782a4d0da29e31f4725dc507d3':
2015-08-27 03:38:22 +00:00