Commit Graph

10597 Commits

Author SHA1 Message Date
Todd Poynor 549260483c am b2a2acfa: am 342a2264: healthd: charger: fix check for charger connected to enter suspend
* commit 'b2a2acfaa62d0e525af6d858335550b4ea449eb0':
  healthd: charger: fix check for charger connected to enter suspend
2014-08-18 22:35:59 +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 b203538e7e am 10cce72c: am 3859029a: am 7fb0ee0c: Merge "Remove androidGetTid."
* commit '10cce72c4bbc8bb8e6466b5511e178321862658a':
  Remove androidGetTid.
2014-08-18 19:47:21 +00: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 32eba1f9e7 am 932c3a1d: am 25282774: am 5f231a43: Merge "Fix win_sdk build by not using vector"
* commit '932c3a1d0507da5ff8d7183fa5a795bce0a86c19':
  Fix win_sdk build by not using vector
2014-08-18 13:36:14 +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 bbdfdff9ad am d5c4ace9: am 583fab69: am 55494fb3: Merge "Switch libnativebridge to clang"
* commit 'd5c4ace9a850b3a5787592983455dcf0960bd676':
  Switch libnativebridge to clang
2014-08-18 10:23:15 +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 045293ff6b am c77755f1: am f81da073: am c0879ee9: Merge "Replace char* with ZipEntryName in ziparchive API."
* commit 'c77755f1390d8b61b5150f4626d7c763657834a2':
  Replace char* with ZipEntryName in ziparchive API.
2014-08-18 09:19:21 +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 5c2d3e23dc am ab9fa4c4: am 82b76249: Remove obsolete tcp buffer size system properties.
* commit 'ab9fa4c4a19179f53bcd87b4768ba91ec4e03435':
  Remove obsolete tcp buffer size system properties.
2014-08-17 23:30:36 +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 a341993851 am 94819e8f: am f4a175b4: am 39ab11d0: Merge "fastboot: add the support of the second stage image"
* commit '94819e8f55205d5417283a5282f89e8cddcbdab8':
  fastboot: add the support of the second stage image
2014-08-16 20:34:19 +00: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
Jeremy Compostella 5a2c19edcc am 310db689: (-s ours) am a42adff9: fastboot: add the support of the second stage image [DO NOT MERGE]
* commit '310db6890396577079d0cfbfa095e80faed471d7':
  fastboot: add the support of the second stage image [DO NOT MERGE]
2014-08-16 05:22:14 +00: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
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
Jeff Brown 8befd6940b am 84a248ce: am 69d68b69: Merge "Add trace tag for power management." into lmp-dev
* commit '84a248ce27bc4e4155ee2f86f8a7038cab8d3b0b':
  Add trace tag for power management.
2014-08-16 03:44:14 +00: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
Calin Juravle 5b4092c11e am 585fc42d: am 935708be: Switch libnativebridge to clang
* commit '585fc42de76e35eab38b1489ac5f71043db05f01':
  Switch libnativebridge to clang
2014-08-16 00:43:30 +00:00
Calin Juravle 585fc42de7 am 935708be: Switch libnativebridge to clang
* commit '935708be6fe366c8e519b01d1fba9fd2414c0dba':
  Switch libnativebridge to clang
2014-08-15 21:16:52 +00:00
Jeff Brown 69d68b69e5 Merge "Add trace tag for power management." into lmp-dev 2014-08-15 18:45:09 +00:00
Calin Juravle 935708be6f Switch libnativebridge to clang
This fixes the mac build.

Change-Id: Icaca0e3bb959072633caf6bfad828a429ff71140
2014-08-15 18:48:53 +01:00
Calin Juravle f39824abc9 am 4c846321: am 338b3395: Merge "Move native bridge library in system/core" into lmp-dev
* commit '4c846321c03ff281f59cb270f5d5a13f83285005':
  Move native bridge library in system/core
2014-08-15 14:44:24 +00:00
Calin Juravle 4c846321c0 am 338b3395: Merge "Move native bridge library in system/core" into lmp-dev
* commit '338b33954b4f557e05e4264f31cd7d7af92b4801':
  Move native bridge library in system/core
2014-08-15 14:39:45 +00:00
Narayan Kamath d0643b28d9 am 68aca93c: am c3ba3245: Merge "Export the new system_server classpath." into lmp-dev
* commit '68aca93ca3bd7c13921089014cce04d07240d0e1':
  Export the new system_server classpath.
2014-08-15 13:40:40 +00:00
Calin Juravle 24b2b18a03 am 62de21e1: am 5ed25acd: am 25a7d5f8: Merge "Move native bridge library in system/core"
* commit '62de21e1487e69268e93481227031f1611d3243f':
  Move native bridge library in system/core
2014-08-15 13:40:23 +00:00
Narayan Kamath 68aca93ca3 am c3ba3245: Merge "Export the new system_server classpath." into lmp-dev
* commit 'c3ba3245a0bb66179fa05aa357382a1886ce387a':
  Export the new system_server classpath.
2014-08-15 13:17:18 +00:00
Calin Juravle 62de21e148 am 5ed25acd: am 25a7d5f8: Merge "Move native bridge library in system/core"
* commit '5ed25acd4ab7c606986c77892c07c2914f8df8f2':
  Move native bridge library in system/core
2014-08-15 12:42:36 +00:00
Piotr Jastrzebski ecccc5ad93 Replace char* with ZipEntryName in ziparchive API.
It's important because entry names can be encoded in UTF-8 and can have \0
character in the middle.
Use vector instead of char* for prefix in IterationHandle.

Bug: 16162465
Change-Id: Ie34c8d7c6231cc258530c22bdde5542895213649
2014-08-15 12:39:45 +01:00
Calin Juravle 5ed25acd4a am 25a7d5f8: Merge "Move native bridge library in system/core"
* commit '25a7d5f892f2606ed28eff761c59693398497343':
  Move native bridge library in system/core
2014-08-15 11:39:22 +00:00
Calin Juravle 338b33954b Merge "Move native bridge library in system/core" into lmp-dev 2014-08-15 04:54:19 +00:00
Calin Juravle 4914fcd91b Move native bridge library in system/core
Bug: 16884833

(cherry picked from commit 961ae12dea)

Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
2014-08-15 12:40:45 +01:00
Narayan Kamath c3ba3245a0 Merge "Export the new system_server classpath." into lmp-dev 2014-08-15 04:54:19 +00:00
Calin Juravle 25a7d5f892 Merge "Move native bridge library in system/core" 2014-08-15 04:45:59 +00:00