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
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
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
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
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
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
Jeff Brown
de4d921192
Add trace tag for power management.
...
Bug: 17004602
Change-Id: Iecd79e6e0417c02b902cde468b0e842f9348b386
2014-08-14 19:24:30 -07:00
Ying Wang
0c3d98b02b
am 87ad7cdc
: am e1ba39aa
: Merge "Fix 64-bit host build."
...
* commit '87ad7cdc590aa4033f0b7ae23d83e2fbc119d07a':
Fix 64-bit host build.
2014-08-14 23:20:06 +00:00
Ying Wang
87ad7cdc59
am e1ba39aa
: Merge "Fix 64-bit host build."
...
* commit 'e1ba39aa6644feb9c5f742f65db6d3363203951f':
Fix 64-bit host build.
2014-08-14 23:16:46 +00:00
Piotr Jastrzebski
d5d04be07f
am fa412127
: am b242ad40
: Merge "Revert "Make sure that names of all entries have the same encoding.""
...
* commit 'fa41212789a068827edc9fd1eac7b6a988cba0a5':
Revert "Make sure that names of all entries have the same encoding."
2014-08-13 10:02:23 +00:00
Piotr Jastrzebski
fa41212789
am b242ad40
: Merge "Revert "Make sure that names of all entries have the same encoding.""
...
* commit 'b242ad40b1e0d3984e469e3d35876a4859f4952b':
Revert "Make sure that names of all entries have the same encoding."
2014-08-13 09:58:33 +00:00
Piotr Jastrzebski
8b4a58e1df
am b720c8d6
: am b0206765
: Merge "Make sure that names of all entries have the same encoding."
...
* commit 'b720c8d601cebbc9f48ef8e51c23fd6d190305f7':
Make sure that names of all entries have the same encoding.
2014-08-13 09:09:36 +00:00
Piotr Jastrzebski
b720c8d601
am b0206765
: Merge "Make sure that names of all entries have the same encoding."
...
* commit 'b020676566f38380f4303eaa7d196d6fef019dd9':
Make sure that names of all entries have the same encoding.
2014-08-13 09:03:11 +00:00
Calin Juravle
961ae12dea
Move native bridge library in system/core
...
Bug: 16884833
Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
2014-08-12 22:39:25 +01:00
Badhri Jagan Sridharan
5d19ccf1c2
am 0be19a53
: Merge "libusbhost: Fix IOCTL call during usb_request_cancel" into lmp-dev
...
* commit '0be19a53cf9532a5e071e640cb3af5946bfc3d6f':
libusbhost: Fix IOCTL call during usb_request_cancel
2014-08-12 21:07:13 +00:00
Badhri Jagan Sridharan
754358aa80
am 0d8943c2
: am e4c5b614
: Merge "libusbhost: Fix IOCTL call during usb_request_cancel"
...
* commit '0d8943c252a21390c63a16ae0f9f1459c3212163':
libusbhost: Fix IOCTL call during usb_request_cancel
2014-08-12 21:05:43 +00:00
Badhri Jagan Sridharan
0d8943c252
am e4c5b614
: Merge "libusbhost: Fix IOCTL call during usb_request_cancel"
...
* commit 'e4c5b6143b12925426a1af36ae0a201d18f93cad':
libusbhost: Fix IOCTL call during usb_request_cancel
2014-08-12 20:59:20 +00:00
Mark Salyzyn
165e4d2202
resolved conflicts for merge of e4ec1e94
to lmp-dev-plus-aosp
...
Change-Id: Iec97b6a1cb7c29073bf9d1ae37d8600ff2ae9a8b
2014-08-12 13:28:08 -07:00
Piotr Jastrzebski
b242ad40b1
Merge "Revert "Make sure that names of all entries have the same encoding.""
2014-08-12 20:07:20 +00:00