Commit graph

1816 commits

Author SHA1 Message Date
Tao Bao
282e572467 am d4547c1d: am e5571a0f: am 585a50ce: Merge "imgdiff: fix file descriptor leak"
* commit 'd4547c1ddaf6ac4b13e9a160582f6baba44860b6':
  imgdiff: fix file descriptor leak
2015-09-08 17:57:58 +00: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
f6dd99f509 am 1e8e6a83: am cf11a160: am f8c303f9: Merge "move uncrypt from init.rc to uncrypt.rc"
* commit '1e8e6a839438a345a9054319d8efda6c95236557':
  move uncrypt from init.rc to uncrypt.rc
2015-09-04 18:13:01 +00: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
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
9edbb3b42e am 834c92b7: am 8e9c6801: recovery: Fix the bug that truncates menu entries.
* commit '834c92b7b145b0ae1800f869170e9ae6d2834fef':
  recovery: Fix the bug that truncates menu entries.
2015-09-03 17:37:28 +00:00
David Zeuthen
47360b009a am ceb81e49: am 1b3195cb: am 4c223f4e: Merge "Add slot_suffix field to struct bootloader_message."
* commit 'ceb81e4931a307c8c907d0063ab2a8f53445d2c9':
  Add slot_suffix field to struct bootloader_message.
2015-09-03 17:37:15 +00: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
7b99cc2a6c am 31dde162: am 6f1f2062: am 6997c287: Merge "updater: Clean up C codes."
* commit '31dde162b6e27d99270b0a0e9b5aa82c527c67a2':
  updater: Clean up C codes.
2015-09-03 00:51:07 +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
30ce0900e3 am d845a2d1: am 73468ee8: (-s ours) am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()."
* commit 'd845a2d1ea4e2ce17d8f788d5ae33bab2bb82dd2':
2015-08-27 14:13:58 +00:00
Tao Bao
ada948d26b am 5e3a40f9: am 304c65b8: (-s ours) am dc61d17d: am 50c17f9d: Merge "GOOGLEGMS-749 Fix integer overflow while applying block based OTA package"
* commit '5e3a40f934ca7d435496dfacf00b7909d3b3d98d':
2015-08-27 14:13:58 +00:00
Tao Bao
8774723423 am 1a42ebc1: am 822685a8: (-s ours) am dbbdcf3f: am 93fa4b67: Merge "edify: Switch to C++."
* commit '1a42ebc16e68d18394f613145aca7d8fd88f2588':
2015-08-27 14:13:57 +00:00
Tao Bao
7f774d2774 am b13fe892: am a9a50fef: (-s ours) am 4854e292: am ad509fd4: Merge "Fix potential crash"
* commit 'b13fe892d82a2ccde3e338c426b6cf70aea1e564':
2015-08-27 14:13:57 +00:00
Tao Bao
46e965c77e am dffdd5eb: am 06e6ccb9: (-s ours) am 434a1761: am 0d46c7ab: Merge "Use unique_ptr and unique_fd to manager FDs."
* commit 'dffdd5eb6d366b2f35ec87f20f91207e3b4657c3':
2015-08-27 14:13:56 +00:00
Tao Bao
1cd7dc43e1 am 85afda17: am b65a9023: (-s ours) am 7f89389a: am 7c511184: Merge "updater: Clean up char* with std::string."
* commit '85afda17522e25637bab37bdff1c5ea56b7c7a51':
2015-08-27 14:13:56 +00:00
Dan Albert
672e28efe5 am 85a77d2a: am c2e91625: (-s ours) am 236b3eb6: am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS."
* commit '85a77d2abef598099b1f64b9efd1af481f2f62fd':
2015-08-27 14:13:55 +00:00
Elliott Hughes
b49fe2b7df am 34fa6d38: am 8fa0007a: (-s ours) am a9390df6: am 06689dc5: Merge "Fix recovery image build."
* commit '34fa6d3891aceef6af910f114310cec17e13b372':
2015-08-27 14:13:54 +00:00
Tao Bao
a18e59d046 am 371ab905: am 7daa48e6: (-s ours) resolved conflicts for merge of be19dce8 to mnc-dev-plus-aosp
* commit '371ab9058e923679e7dd451bc8351e6e0ce0c3b0':
2015-08-27 14:13:54 +00:00
Tao Bao
3a77916ff0 am ea5d8f0a: am 0e2efab3: (-s ours) am 393d1e73: am 27c1ab20: Merge "udpater: Call fsync() after rename()."
* commit 'ea5d8f0affc1170fc9bd6ff05a00adca712f18d6':
2015-08-27 14:13:53 +00:00
Tao Bao
eec13b8377 am 3fd097f8: am 854ae7f9: (-s ours) am 2e979ef6: am 302779e7: Merge "recovery: Allow "Mount /system" for system_root_image."
* commit '3fd097f8a81b57046f7200f659211971025ad7bf':
2015-08-27 14:13:52 +00:00
Tao Bao
c6bcbe310d am 77de4783: am f3f27990: (-s ours) am 7666f65b: am 62e19231: Merge "updater: Hoist fsync() to outer loop."
* commit '77de478325225ae1adf8e669adff5cd5052cbea8':
2015-08-27 14:13:52 +00:00
Tao Bao
d3e0219aca am 05c4b53e: am cb0e7f2d: (-s ours) am 0622ccb3: am 6a4a33e3: Merge "applypatch: Fix the checking in WriteToPartition()."
* commit '05c4b53eb53c069ebb2433947193f7d613e4ff04':
2015-08-27 14:13:51 +00:00
Tao Bao
78551225df am f6bebbd7: am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."
* commit 'f6bebbd72cf25acc65373cf26c3eac7d4b6bf686':
2015-08-27 14:13:50 +00:00
Tao Bao
258f83cc65 am d37f91d1: am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."
* commit 'd37f91d18da6e87eb3f2d11dd1cd1645e255cd38':
2015-08-27 14:13:49 +00:00
Tao Bao
9f012cd7a6 am c73e18f0: am 7665d443: (-s ours) am 87f2c673: am cc3c3414: Merge "updater: libapplypatch needs libbase now."
* commit 'c73e18f0a433268300cfaa767b06424df71ff63b':
2015-08-27 14:13:49 +00:00
Tao Bao
2addc407d0 am f075f9a1: am 5040636a: (-s ours) am 1dc71bec: am cfd9d9c7: Merge "applypatch: Refactor strtok()."
* commit 'f075f9a17ab01fa13a651c675aed2837a8bf3191':
2015-08-27 14:13:48 +00:00
Tao Bao
477157d88a am ca66fc1c: am 596219d9: (-s ours) am b91e7005: am 85090d0c: Merge "recovery: Switch fuse_* to C++."
* commit 'ca66fc1cb204dfe9e9b8c8eaad5be95a78207212':
2015-08-27 14:13:47 +00:00
Tao Bao
43e4abd95f am d33e21a7: am 0e7368a5: (-s ours) am 328cb8cb: am 025c0e79: Merge "Clean up LOG functions."
* commit 'd33e21a7ae7b37590ad41fac56f87141c597616c':
2015-08-27 14:13:46 +00:00
Tao Bao
f8ab5bdba6 am 9da33c67: am 3231c7ca: (-s ours) am 307eecfd: am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp."
* commit '9da33c67655c5d113f75a1f493b51cfee86d298c':
2015-08-27 14:13:45 +00:00
Tao Bao
8e897953ac am f0e341b4: am 5391dfdb: (-s ours) am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD""
* commit 'f0e341b44949564de0d33361c1284b8aff19a8bd':
2015-08-27 14:13:44 +00:00
Paul Lawrence
4b34bcf20f am 3ac4765a: am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev
* commit '3ac4765a14334f0aa574b5cffb5349cc1c214cfe':
2015-08-27 14:13:43 +00:00
Tao Bao
081408da86 am b3f4921c: am 2fc4d435: (-s ours) am 4e6507f3: am 2490dbc9: Merge "Allow mounting squashfs partitions"
* commit 'b3f4921c67bdc3260bfd6274c2ab53d10b53a9c2':
2015-08-27 14:13:42 +00:00
Paul Lawrence
e7767f0e00 am 04d9b850: am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev
* commit '04d9b8501a58de6ee7c5aa3635673150bf88cb06':
2015-08-27 14:13:40 +00: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