Commit graph

1586 commits

Author SHA1 Message Date
Matthew Xie
2ff730ccd0 am 1ee5f5ef: Merge "BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-modular-dev
* commit '1ee5f5ef5a3d75bebcc9cd78fd9150c68f5485fb':
  BLE peripheral mode (1/4): change HAL to support service data and service uuids.
2014-01-14 20:46:37 +00:00
Matthew Xie
1ee5f5ef5a Merge "BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-modular-dev 2014-01-14 20:42:38 +00:00
Colin Cross
7465d7187b am cd3f545e: am 260b0f50: am 2428eaa3: am a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"
* commit 'cd3f545ef8e7ac8a622c3d53d8241ff25fdbe86e':
  hardware: fix check for ro.hardware.<class> property
2014-01-14 08:06:29 +00:00
Colin Cross
cd3f545ef8 am 260b0f50: am 2428eaa3: am a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"
* commit '260b0f50e97794d5663de55664e3ec554e216dc3':
  hardware: fix check for ro.hardware.<class> property
2014-01-14 08:03:28 +00:00
Colin Cross
260b0f50e9 am 2428eaa3: am a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"
* commit '2428eaa319bfd0481f49e364c4f242300f4ed291':
  hardware: fix check for ro.hardware.<class> property
2014-01-14 07:59:52 +00:00
Colin Cross
2428eaa319 am a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"
* commit 'a97c6fecdbe576b732a2ca00fbf4dcb82f079c8f':
  hardware: fix check for ro.hardware.<class> property
2014-01-13 23:56:52 -08:00
Colin Cross
a97c6fecdb Merge "hardware: fix check for ro.hardware.<class> property" 2014-01-14 07:52:15 +00:00
Colin Cross
f7d761ca34 hardware: fix check for ro.hardware.<class> property
Replace == with >, property_get returns the length of the
property if found.

Change-Id: I4b8fe8f8dba578112d21eee5dc64be4aa27f3bfb
2014-01-13 23:43:23 -08:00
Wei Wang
a16d11da60 BLE peripheral mode (1/4): change HAL to support service data and service uuids.
Change-Id: I19a3755a4ed16e1ae03368cecee97773c05c1770
2014-01-13 17:31:34 -08:00
Vincent Becker
022224fbf8 Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.
Android's implementation of vibrator needs to be done inside a
hardware module, so that it can make a vendor implementation possible.

Hw module's name becomes vibrator.default.so.

This change is related to other changes in:
 - frameworks/base
 - hardware/libhardware_legacy
 - device/generic/goldfish
 - platform/build

Change-Id: I844279f5535289f079d412fdc44c5cb3c9c1130c
Author: Vincent Becker <vincentx.becker@intel.com>
Signed-off-by: Vincent Becker <vincentx.becker@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: David Wagner <david.wagner@intel.com>
Author-tracking-BZ: 49760 94611
2014-01-13 15:07:41 +01:00
Colin Cross
4d3d7a374f am 904812e1: am 728c78a4: am 7c2a4681: am e0c252ae: Merge "hardware: add ro.hardware.<class> to HAL loading properites list"
* commit '904812e158e8cea0d7a69bf19bf50a57a62cd26a':
  hardware: add ro.hardware.<class> to HAL loading properites list
2014-01-02 21:34:05 +00:00
Colin Cross
904812e158 am 728c78a4: am 7c2a4681: am e0c252ae: Merge "hardware: add ro.hardware.<class> to HAL loading properites list"
* commit '728c78a4d189c3677b6bc061b8602c28330a5464':
  hardware: add ro.hardware.<class> to HAL loading properites list
2014-01-02 21:31:52 +00:00
Colin Cross
728c78a4d1 am 7c2a4681: am e0c252ae: Merge "hardware: add ro.hardware.<class> to HAL loading properites list"
* commit '7c2a468127bbfb48f7cb239c992edfa48fd54cd2':
  hardware: add ro.hardware.<class> to HAL loading properites list
2014-01-02 21:28:41 +00:00
Colin Cross
7c2a468127 am e0c252ae: Merge "hardware: add ro.hardware.<class> to HAL loading properites list"
* commit 'e0c252ae43490cc324b89f6d7cbaa33af8ff341d':
  hardware: add ro.hardware.<class> to HAL loading properites list
2014-01-02 13:26:21 -08:00
Colin Cross
e0c252ae43 Merge "hardware: add ro.hardware.<class> to HAL loading properites list" 2014-01-02 21:21:36 +00:00
Colin Cross
85ab5d1f91 hardware: add ro.hardware.<class> to HAL loading properites list
Try to load a HAL determined by ro.hardware.<class> first before
falling back to hardware, board, platform, arch, and default.
This is intended to be used to support multiple hardware variants
from the same source.  For example, a single build that supports
two gps chips, gps001 and gpsb, could use /factory/factory.prop
to set ro.hardware.gps=gps001 or ro.hardware.gps=gpsb, which would
load gps.gps001.so or gps.gpsb.so.  Two separate builds from the
same source could use PRODUCT_PROPERTY_OVERRIDES to set the
properties.

Change-Id: I1ac46c21ceb27ceb5165e8c44e9373e9c5d4e34e
2014-01-02 13:17:51 -08:00
Wei Wang
75c6554744 Merge "BLE peripheral mode (1/4): change HAL to support service data and service uuids." 2013-12-20 19:37:33 +00:00
Clay Murphy
8db1fb408c Docs: Removing contents now on source.android.com
Bug: 10134622

Change-Id: Ief5a53f1b5e5eff9ade45763d895029428266980
2013-12-19 16:05:18 -08:00
Wei Wang
7a8778a4e6 BLE peripheral mode (1/4): change HAL to support service data and service uuids.
Change-Id: I19a3755a4ed16e1ae03368cecee97773c05c1770
2013-12-19 22:02:33 +00:00
Zhijun He
b0c939fb6b camera3: Add manual control template
Bug: 12134077
Change-Id: I0681f881f41dd3ab8acab400f84c2568a97e06bc
2013-12-13 15:56:33 -08:00
Sasha Levitskiy
ec61e78021 am f49598e0: am 024c1534: Camera: HAL3: device test fixture and a test.
* commit 'f49598e05886c0f71efad01c1aefb1a90e0b49d5':
  Camera: HAL3: device test fixture and a test.
2013-12-12 23:28:16 +00:00
Sasha Levitskiy
f49598e058 am 024c1534: Camera: HAL3: device test fixture and a test.
* commit '024c15346b00c2ac7d6b53e78422570bbc4245c7':
  Camera: HAL3: device test fixture and a test.
2013-12-12 23:25:26 +00:00
Sasha Levitskiy
024c15346b Camera: HAL3: device test fixture and a test.
Change-Id: Ifaec4be35e8f4fb80c8e71e24499fbcd40fddb6e
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2013-12-12 14:08:55 -08:00
Sasha Levitskiy
271f39d8bb am 44a61b2d: am 4a7b2171: Camera HAL3: first few unit tests.
* commit '44a61b2da0d1f348151dc7b82385aab582b1e429':
  Camera HAL3: first few unit tests.
2013-12-12 03:13:39 +00:00
Sasha Levitskiy
44a61b2da0 am 4a7b2171: Camera HAL3: first few unit tests.
* commit '4a7b2171f00ba37e301105e8ea1f61dddaa4db3d':
  Camera HAL3: first few unit tests.
2013-12-12 03:10:43 +00:00
Sasha Levitskiy
4a7b2171f0 Camera HAL3: first few unit tests.
Change-Id: I413dc447faadd4fd90986bc924722b2826e19382
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2013-12-12 03:06:31 +00:00
Mike Lockwood
431613a68b am f8477624: (-s ours) DO NOT MERGE: Sensor multi HAL
* commit 'f84776247777ca8710eca8a911f607e10256cc7d':
  DO NOT MERGE: Sensor multi HAL
2013-12-10 18:43:41 +00:00
Qiwen Zhao
fcd08ec1ca am 0bd030b5: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
* commit '0bd030b5df7381949ff368f15ebca214560fbf22':
2013-12-10 18:43:40 +00:00
Mike Lockwood
f847762477 DO NOT MERGE: Sensor multi HAL
Squashed commit of:

Move sensors multi HAL to libhardware

Added a SensorEventQueue, a circular buffer meant for reading with one thread
and polling a subhal with another. The writing thread gets access to pointers
in the internal buffer. This design avoids a memcpy on write when the multihal
fetches subhal events using poll().

Unit-tests include multithreaded reading and writing lots of events, in
random-sized chunks.

This is not used by the multihal yet. That will be a different CL.

MultiHal multithreaded polling

Tests SensorEventQueue I/O when the queue is full.
Reduced debug logging in multihal.

deactivated multihal logspam, made warnings warnings, left critical startup info

Removed unneeded linux/input.h includes, to fix Mac SDK build

Change-Id: I1e35508949df98a1acef7a4a2d012eea87b4a5eb
2013-12-09 15:26:55 -08:00
Qiwen Zhao
0bd030b5df DO NOT MERGE reset to goog/klp-volantis-dev 2013-12-09 14:19:06 -08:00
Qiwen Zhao
9de171858c am 888e507b: (-s ours) snap to klp-dev-plus-aosp 19b13b9 with history
* commit '888e507b9756d0a572944ee81e80ffa08797b79d':
2013-12-06 22:19:20 +00:00
Qiwen Zhao
888e507b97 snap to klp-dev-plus-aosp 19b13b9 with history 2013-12-06 13:30:37 -08:00
The Android Open Source Project
50cdd6415e am 19b13b9a: am 20ebefd9: Merge commit \'eed5dceb4a0bc02f50f236ab191d30c49c58f610\' into HEAD
* commit '19b13b9a4545ff3974b6a9a620f7266b3a0a2c67':
2013-12-06 01:38:46 +00:00
The Android Open Source Project
19b13b9a45 am 20ebefd9: Merge commit \'eed5dceb4a0bc02f50f236ab191d30c49c58f610\' into HEAD
* commit '20ebefd966eed9da545ab645199c2f93ca93af20':
2013-12-05 17:25:49 -08:00
Mike Lockwood
b4ef2bbda2 am 0bae43dc: (-s ours) DO NOT MERGE: Sensor multi HAL
* commit '0bae43dc59372a84ffe0c1e57af68076dffab73a':
  DO NOT MERGE: Sensor multi HAL
2013-12-05 22:44:56 +00:00
Alex Ray
215913e370 Merge "modules: camera: replace pthread mutex with utils'" 2013-12-05 22:17:07 +00:00
The Android Open Source Project
20ebefd966 Merge commit 'eed5dceb4a0bc02f50f236ab191d30c49c58f610' into HEAD 2013-12-05 12:38:20 -08:00
Mike Lockwood
0bae43dc59 DO NOT MERGE: Sensor multi HAL
Squashed commit of:

Move sensors multi HAL to libhardware

Added a SensorEventQueue, a circular buffer meant for reading with one thread
and polling a subhal with another. The writing thread gets access to pointers
in the internal buffer. This design avoids a memcpy on write when the multihal
fetches subhal events using poll().

Unit-tests include multithreaded reading and writing lots of events, in
random-sized chunks.

This is not used by the multihal yet. That will be a different CL.

MultiHal multithreaded polling

Tests SensorEventQueue I/O when the queue is full.
Reduced debug logging in multihal.

deactivated multihal logspam, made warnings warnings, left critical startup info

Removed unneeded linux/input.h includes, to fix Mac SDK build
2013-12-02 07:34:19 -08:00
Rom Lemarchand
2955fe2083 am e735e5fa: am 047510b1: Merge "gralloc: delete unused mutex declaration"
* commit 'e735e5fa42f62d856e6c86d7ee785bb9797b6750':
  gralloc: delete unused mutex declaration
2013-11-27 10:32:10 -08:00
Rom Lemarchand
e735e5fa42 am 047510b1: Merge "gralloc: delete unused mutex declaration"
* commit '047510b132e33c26607b4b93e806884aa4d13f19':
  gralloc: delete unused mutex declaration
2013-11-26 10:37:58 -08:00
Rom Lemarchand
047510b132 Merge "gralloc: delete unused mutex declaration" 2013-11-26 18:30:34 +00:00
Rom Lemarchand
0287721d28 gralloc: delete unused mutex declaration
Change-Id: Ibc7e70887b61f7dd885c86d412387636d3a6a867
2013-11-26 10:01:25 -08:00
Rom Lemarchand
eeddc12059 Merge changes Ib623f1a5,I058c963d,I63f00004
* changes:
  HAL test: statically test the last member of structs
  HAL test: statically test the offsets of known struct members
  HAL test: statically test the size of HAL structs
2013-11-24 18:31:06 +00:00
The Android Open Source Project
6895f2952d am dbf6b345: am bae5cf92: Merge commit \'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0\' into HEAD
* commit 'dbf6b34587293fa07534cbcfbb6032bab6a975b2':
2013-11-22 19:31:25 -08:00
Rom Lemarchand
ca10795491 HAL test: statically test the last member of structs
Ensure the last member of structs is actually the one we expect

Change-Id: Ib623f1a5e09fd9b8d464456528a94742b0ccd00b
2013-11-22 17:47:53 -08:00
Rom Lemarchand
1b22d07594 HAL test: statically test the offsets of known struct members
Make sure the ABI doesn't get inadvertently broken by moving HAL interface
struct members around.

Change-Id: I058c963df002dc7c12eb24181d5db74c0c6fd38c
2013-11-22 17:47:52 -08:00
The Android Open Source Project
dbf6b34587 am bae5cf92: Merge commit \'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0\' into HEAD
* commit 'bae5cf92cfa9e2867af91057265df7f029f7865e':
2013-11-22 17:41:01 -08:00
The Android Open Source Project
bae5cf92cf Merge commit 'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0' into HEAD 2013-11-22 10:35:26 -08:00
Rom Lemarchand
4c2aa4c223 HAL test: statically test the size of HAL structs
Ensure none of the HAL structs change size over time.
Issues might arise when making changes without taking the different
pointer sizes for specific architectures into account.

Change-Id: I63f00004a23f09b2f46df01e7c69296766a5d03f
2013-11-21 15:52:05 -08:00
Aaron Whyte
22bf9724a1 Removed unneeded linux/input.h includes, to fix Mac SDK build
Change-Id: I3bcfadb9c95a9239d8098989c60d5604bfdfb66f
2013-11-14 19:15:25 -08:00