Commit Graph

10481 Commits

Author SHA1 Message Date
Elliott Hughes 3601abb810 am f7e88e51: am 373c7758: Merge "There\'s no non-SMP LP64."
* commit 'f7e88e51b31e64e085b3a564f4b1baa8334d63f1':
  There's no non-SMP LP64.
2014-08-20 20:49:36 +00:00
Elliott Hughes f7e88e51b3 am 373c7758: Merge "There\'s no non-SMP LP64."
* commit '373c77583f9d8eab88e4321d1a2e2af8f5ae8ea7':
  There's no non-SMP LP64.
2014-08-20 20:22:23 +00:00
Elliott Hughes 373c77583f Merge "There's no non-SMP LP64." 2014-08-20 12:21:52 +00:00
Elliott Hughes 901c900ce6 There's no non-SMP LP64.
Bug: 17108682
Change-Id: I7e44ab48b5cacf989333882ffe67f39e9b0ce843
2014-08-20 13:05:55 -07:00
Igor Murashkin 831789a9f2 am 6ba555f2: Merge "libutils: Don\'t segfault ProcessCallStack when getting thread name fails" into lmp-dev
* commit '6ba555f2ad878129cd1da9dd7b7613ab166090ab':
  libutils: Don't segfault ProcessCallStack when getting thread name fails
2014-08-19 23:44:28 +00:00
Igor Murashkin 6ba555f2ad Merge "libutils: Don't segfault ProcessCallStack when getting thread name fails" into lmp-dev 2014-08-19 22:53:25 +00:00
Dan Albert a4c647b698 am 3e3fbc4d: Merge "Update for public android_set_abort_message()." into lmp-dev
* commit '3e3fbc4d734c1394823ac3d91b88c4aa87c6b265':
  Update for public android_set_abort_message().
2014-08-19 20:25:26 +00:00
Michael Wright 8582af78e3 am 4fe327b9: Merge "Remove inputflinger from init. DO NOT MERGE" into lmp-dev
* commit '4fe327b902a1d5ff48878c1801cce8cdbe718d31':
  Remove inputflinger from init. DO NOT MERGE
2014-08-19 20:25:26 +00:00
Igor Murashkin 63fbdb6440 libutils: Don't segfault ProcessCallStack when getting thread name fails
There's an inherent race in trying to read out the thread name from
the system and the thread closing out on its own (and thus being removed
from procfs).

Try to handle this by formatting the thread name unconditionally with
the tid when getting the thread name fails (instead of dereferencing
NULL and crashing).

Bug: 15406837
Change-Id: Ibf2208b8ce345589e7e9c57e6a307728d1121c5d
2014-08-19 11:48:52 -07:00
Dan Albert 8c9cbb214c am 5c16eb07: am afc9bc01: Merge "Update for public android_set_abort_message()."
* commit '5c16eb07721252a8a5d8ad436319e94d7c974e44':
  Update for public android_set_abort_message().
2014-08-19 17:32:54 +00:00
Dan Albert 5c16eb0772 am afc9bc01: Merge "Update for public android_set_abort_message()."
* commit 'afc9bc01b4f8a239b5f1a1c695b941a7d0ab8825':
  Update for public android_set_abort_message().
2014-08-19 17:24:35 +00:00
Piotr Jastrzebski 25ec0d4d96 am 6310d253: am 8fd1f27e: Merge "Reject zip archives with entry names containing \0."
* commit '6310d253ec49e662200fc2bfd8efba530a93c4dc':
  Reject zip archives with entry names containing \0.
2014-08-19 15:58:58 +00:00
Piotr Jastrzebski 6310d253ec am 8fd1f27e: Merge "Reject zip archives with entry names containing \0."
* commit '8fd1f27ed866169684f44f24aeaa5c4722427d18':
  Reject zip archives with entry names containing \0.
2014-08-19 15:54:23 +00:00
Piotr Jastrzebski 134f443696 am f36a2311: am 3e13ed08: Merge "Cleanup ziparchive"
* commit 'f36a2311ab7232e0b91dc009a3a2d1d9c8130c37':
  Cleanup ziparchive
2014-08-19 10:14:45 +00:00
Piotr Jastrzebski f36a2311ab am 3e13ed08: Merge "Cleanup ziparchive"
* commit '3e13ed0864944c5fcff9d519eacf1f75c7db652a':
  Cleanup ziparchive
2014-08-19 10:09:54 +00:00
Todd Poynor b2a2acfaa6 am 342a2264: healthd: charger: fix check for charger connected to enter suspend
* commit '342a2264b96ab05dc8fdbfa8bbe354ce2f4b06ca':
  healthd: charger: fix check for charger connected to enter suspend
2014-08-18 22:27:39 +00:00
Todd Poynor 342a2264b9 healthd: charger: fix check for charger connected to enter suspend
Logic for this check was inadvertently reversed when porting this from
the charger daemon to healthd.  Request suspend if a charegr is connected,
else stay out of suspend waiting for a charger connect or power off if
none.

Bug: 17112463
Change-Id: Iffdb6dbcd0d0a2a614ff8f50bf5f2e22e1ad552f
2014-08-18 14:32:14 -07:00
Elliott Hughes 10cce72c4b am 3859029a: am 7fb0ee0c: Merge "Remove androidGetTid."
* commit '3859029a48aa78150fa61eb4988214f8632b33ce':
  Remove androidGetTid.
2014-08-18 19:34:23 +00:00
Elliott Hughes 3859029a48 am 7fb0ee0c: Merge "Remove androidGetTid."
* commit '7fb0ee0c4d3ba83ec960493e43cba9cfa7a6130f':
  Remove androidGetTid.
2014-08-18 19:24:33 +00:00
Piotr Jastrzebski 932c3a1d05 am 25282774: am 5f231a43: Merge "Fix win_sdk build by not using vector"
* commit '25282774247e841d6d5a3ba903f49866666119b2':
  Fix win_sdk build by not using vector
2014-08-18 13:28:23 +00:00
Piotr Jastrzebski 2528277424 am 5f231a43: Merge "Fix win_sdk build by not using vector"
* commit '5f231a43b342fcfbd778d14f953b0b63715ee7f2':
  Fix win_sdk build by not using vector
2014-08-18 13:20:43 +00:00
Calin Juravle d5c4ace9a8 am 583fab69: am 55494fb3: Merge "Switch libnativebridge to clang"
* commit '583fab69aeb14f96bb3baeb28da2002178e02a42':
  Switch libnativebridge to clang
2014-08-18 10:16:13 +00:00
Calin Juravle 583fab69ae am 55494fb3: Merge "Switch libnativebridge to clang"
* commit '55494fb32da5d35b5e93266633b4b14f27011f71':
  Switch libnativebridge to clang
2014-08-18 10:11:49 +00:00
Piotr Jastrzebski c77755f139 am f81da073: am c0879ee9: Merge "Replace char* with ZipEntryName in ziparchive API."
* commit 'f81da073dab8c6eba0a86975f4d94eae5dc461cf':
  Replace char* with ZipEntryName in ziparchive API.
2014-08-18 09:13:07 +00:00
Piotr Jastrzebski f81da073da am c0879ee9: Merge "Replace char* with ZipEntryName in ziparchive API."
* commit 'c0879ee9d39ad4e9a2628c5cf1aaf4f843c13760':
  Replace char* with ZipEntryName in ziparchive API.
2014-08-18 09:04:10 +00:00
Robert Greenwalt ab9fa4c4a1 am 82b76249: Remove obsolete tcp buffer size system properties.
* commit '82b76249fbc339e82ab47a956f7e17160247e4c4':
  Remove obsolete tcp buffer size system properties.
2014-08-17 23:22:33 +00:00
Robert Greenwalt 82b76249fb Remove obsolete tcp buffer size system properties.
Change-Id: If6fb6fdcf8975e6102e84594ee3f64a5be6166f6
2014-08-17 15:17:00 -07:00
Colin Cross 94819e8f55 am f4a175b4: am 39ab11d0: Merge "fastboot: add the support of the second stage image"
* commit 'f4a175b4d19608ffe7807444628a3d15053d7e5b':
  fastboot: add the support of the second stage image
2014-08-16 20:28:12 +00:00
Piotr Jastrzebski 8fd1f27ed8 Merge "Reject zip archives with entry names containing \0." 2014-08-16 05:59:09 +00:00
Piotr Jastrzebski 78271ba97b Reject zip archives with entry names containing \0.
There should never be a need of an entry name with \0 character.

Bug: 16162465
Change-Id: Ia2ec57959280c1bb972c4d59d890c8540c5b9081
2014-08-19 11:02:58 +01:00
Jeremy Compostella 310db68903 am a42adff9: fastboot: add the support of the second stage image [DO NOT MERGE]
* commit 'a42adff905600219cbf5ef217d2b46670225aca3':
  fastboot: add the support of the second stage image [DO NOT MERGE]
2014-08-16 05:17:12 +00:00
Piotr Jastrzebski 5f231a43b3 Merge "Fix win_sdk build by not using vector" 2014-08-16 04:55:08 +00:00
Piotr Jastrzebski 8e08536108 Fix win_sdk build by not using vector
Change-Id: I4e9ee4286ea29e1f5f2ee477525e79bfa16ad9a0
2014-08-18 14:04:56 +01:00
Dan Albert 3e3fbc4d73 Merge "Update for public android_set_abort_message()." into lmp-dev 2014-08-16 04:32:18 +00:00
Dan Albert c68fedce06 Update for public android_set_abort_message().
Since android_set_abort_message() is quite helpful to the platform, it's
becoming promoted to a real header with a non-private name.

Bug: 17059126
Change-Id: I3ed12b66eb07f3a6a08366d5eee147809d9a3ce9
(cherry picked from commit 4047075da6)
2014-08-19 10:39:46 -07:00
Piotr Jastrzebski 3e13ed0864 Merge "Cleanup ziparchive" 2014-08-16 04:31:31 +00:00
Piotr Jastrzebski 10aa9a0e24 Cleanup ziparchive
Addressed review comments from 8e08536108

Change-Id: If576e2d6cc5ad330a7dee66b09663e0c04ea3801
2014-08-19 10:58:03 +01:00
Calin Juravle 55494fb32d Merge "Switch libnativebridge to clang" 2014-08-16 04:31:31 +00:00
Calin Juravle db2127b662 Switch libnativebridge to clang
This fixes the mac build.

(cherry picked from commit 935708be6f)

Change-Id: I246a1c0af2124ed1cec653f2f44ca256f26534ff
2014-08-18 11:05:26 +01:00
Piotr Jastrzebski c0879ee9d3 Merge "Replace char* with ZipEntryName in ziparchive API." 2014-08-16 04:31:31 +00:00
Jeremy Compostella a42adff905 fastboot: add the support of the second stage image [DO NOT MERGE]
The AOSP bootimage format allows the use of a second stage image
however the fastboot boot and flash:row commands do not allow the
"secondstage" optional argument.  This patch adds the support of this
argument for both commands.

Change-Id: I00403a95d7460a00233841ba0fe0e8a69d78c7b4
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2014-08-15 21:21:09 -07:00
Colin Cross f4a175b4d1 am 39ab11d0: Merge "fastboot: add the support of the second stage image"
* commit '39ab11d0d46b9be1bb41241ff58e3f6f3259dd74':
  fastboot: add the support of the second stage image
2014-08-16 04:14:14 +00:00
Elliott Hughes 7fb0ee0c4d Merge "Remove androidGetTid." 2014-08-16 04:08:14 +00:00
Elliott Hughes b7659613b2 Remove androidGetTid.
Bug: 17048545
Change-Id: I93cbb2d7bd18d506b5f5f7f262dd9ac0fca053b4
2014-08-18 10:47:37 -07:00
Colin Cross 39ab11d0d4 Merge "fastboot: add the support of the second stage image" 2014-08-16 04:08:14 +00:00
Dan Albert afc9bc01b4 Merge "Update for public android_set_abort_message()." 2014-08-16 04:03:35 +00:00
Dan Albert 4047075da6 Update for public android_set_abort_message().
Since android_set_abort_message() is quite helpful to the platform, it's
becoming promoted to a real header with a non-private name.

Bug: 17059126
Change-Id: I3ed12b66eb07f3a6a08366d5eee147809d9a3ce9
2014-08-18 17:29:34 -07:00
Michael Wright 4fe327b902 Merge "Remove inputflinger from init. DO NOT MERGE" into lmp-dev 2014-08-16 03:51:48 +00:00
Michael Wright 1de92cffc7 Remove inputflinger from init. DO NOT MERGE
Change-Id: I6ae2815a0c3f6b9c69e712af3ed6ce9d455ef3d3
2014-08-19 13:02:47 -07:00
Jeff Brown 84a248ce27 am 69d68b69: Merge "Add trace tag for power management." into lmp-dev
* commit '69d68b69e5341124c1947f3110c67aa8836e3437':
  Add trace tag for power management.
2014-08-16 03:14:32 +00:00