Commit Graph

7296 Commits

Author SHA1 Message Date
Narayan Kamath 0e804d542a am d396b9db: am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
* commit 'd396b9dbd99924f7c8687227b22220a87c85d9c7':
  Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-16 22:33:14 +00:00
Tao Bao 4007899fd5 am 6e9f726f: am f66e08a2: am a42a322d: Merge "updater: Manage buffers with std::vector."
* commit '6e9f726f8e897ec39320ebf099b4662788bb59a1':
  updater: Manage buffers with std::vector.
2015-09-16 21:17:10 +00:00
Tao Bao 6e9f726f8e am f66e08a2: am a42a322d: Merge "updater: Manage buffers with std::vector."
* commit 'f66e08a2a0c4bcc3f0447aac318e71b829e2743b':
  updater: Manage buffers with std::vector.
2015-09-16 21:09:50 +00:00
Tao Bao f66e08a2a0 am a42a322d: Merge "updater: Manage buffers with std::vector."
* commit 'a42a322d8f6de0157625b518d12d1919f1e0dd7e':
  updater: Manage buffers with std::vector.
2015-09-16 21:01:19 +00:00
Tao Bao a42a322d8f Merge "updater: Manage buffers with std::vector." 2015-09-16 19:12:14 +00:00
David Pursell e432b49879 am cd3a68ce: am 49a49e4f: am ee17242f: Merge "minadbd: update service_to_fd() signature."
* commit 'cd3a68ce371fd446b0b5d8dde4f4a262be1e1fe9':
  minadbd: update service_to_fd() signature.
2015-09-14 19:10:11 +00:00
David Pursell cd3a68ce37 am 49a49e4f: am ee17242f: Merge "minadbd: update service_to_fd() signature."
* commit '49a49e4f0659696b71c0ec2d32a0ac4948c5d977':
  minadbd: update service_to_fd() signature.
2015-09-14 19:02:41 +00:00
David Pursell 49a49e4f06 am ee17242f: Merge "minadbd: update service_to_fd() signature."
* commit 'ee17242f904730c759272b2576aafc59d764525b':
  minadbd: update service_to_fd() signature.
2015-09-14 18:49:41 +00:00
David Pursell ee17242f90 Merge "minadbd: update service_to_fd() signature." 2015-09-14 18:39:37 +00:00
Narayan Kamath d396b9dbd9 am 710b6bb9: am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
* commit '710b6bb9d7d36ce16453850efc3112016a77e9ff':
  Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-12 06:30:01 +00:00
Tao Bao 47506a2c96 am 8b2dcfb1: am 60524198: am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."
* commit '8b2dcfb1049ddc2ff6111c4faa81ae20c6545285':
  recovery: Remove redirect_stdio() when calling ShowFile().
2015-09-12 05:07:56 +00:00
Tao Bao 8b2dcfb104 am 60524198: am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."
* commit '605241984cc41f62e2f2e005865d7afed504a972':
  recovery: Remove redirect_stdio() when calling ShowFile().
2015-09-12 01:24:49 +00:00
Tao Bao 605241984c am b83fd518: Merge "recovery: Remove redirect_stdio() when calling ShowFile()."
* commit 'b83fd518262853d42b5a73a61ec6fdfafe0f5564':
  recovery: Remove redirect_stdio() when calling ShowFile().
2015-09-12 01:15:45 +00:00
Tao Bao b83fd51826 Merge "recovery: Remove redirect_stdio() when calling ShowFile()." 2015-09-12 01:09:49 +00:00
Tao Bao 26679ce536 am 7c3d09c2: am 0cf19d9b: am 7a677807: Merge "updater: Fix the line breaks in ui_print commands."
* commit '7c3d09c2f3524e546989125d75f7944f280fc6fe':
  updater: Fix the line breaks in ui_print commands.
2015-09-10 21:01:35 +00:00
Narayan Kamath 710b6bb9d7 am ec4b58ad: (-s ours) am ec63d564: Track usage of Vector / SortedVector from libutils DO NOT MERGE
* commit 'ec4b58ad8a21b511bf6b136792bb924eb6e9e299':
  Track usage of Vector / SortedVector from libutils DO NOT MERGE
2015-09-10 20:55:33 +00:00
Tao Bao 7c3d09c2f3 am 0cf19d9b: am 7a677807: Merge "updater: Fix the line breaks in ui_print commands."
* commit '0cf19d9ba10c325af928e44d2c11bc74daa39a7c':
  updater: Fix the line breaks in ui_print commands.
2015-09-10 20:54:23 +00:00
Tao Bao 9a7fd80d2d recovery: Remove redirect_stdio() when calling ShowFile().
When calling ScreenRecoveryUI::ShowFile(), the only thing that gets
inadequately logged is the progress bar. Replace the call to
ScreenRecoveryUI::Print() with ScreenRecoveryUI::PrintOnScreenOnly() for
the progress bar, so we can avoid calling redirect_stdio().

Change-Id: I4d7c5d5b39bebe0d5880a99d7a72cee4f0b8f325
2015-09-10 13:42:05 -07:00
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 74931e639a am 272d268c: am 50828f58: am e520f1d4: Merge "updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter."
* commit '272d268c17a181b4b20ea8c6101e6450511ce786':
  updater: Replace the pointers in LoadSrcTgtVersion[1-3]() parameter.
2015-09-09 18:31:55 +00: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 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
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 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