OSDN Git Service

android-x86/hardware-libhardware.git
10 years agoMerge "camera3: Update flush HAL API spec"
Zhijun He [Tue, 4 Feb 2014 01:04:16 +0000 (01:04 +0000)]
Merge "camera3: Update flush HAL API spec"

10 years agocamera3: Add camera close KPI
Zhijun He [Fri, 31 Jan 2014 19:35:45 +0000 (11:35 -0800)]
camera3: Add camera close KPI

Change-Id: I265750ade49c63beedd3d9d0f2b8e7b3d19cc38f

10 years agocamera3: Update flush HAL API spec
Zhijun He [Mon, 27 Jan 2014 22:49:44 +0000 (14:49 -0800)]
camera3: Update flush HAL API spec

Change-Id: I4e36dcc4445c2fae71fe4ce22a0f3b9a28abe1c0

10 years agoam 8ded7780: am 3da0d0f4: am 662e97ee: am aea8c156: Merge "hardware/libhardware:...
Colin Cross [Tue, 28 Jan 2014 01:08:45 +0000 (01:08 +0000)]
am 8ded7780: am 3da0d0f4: am 662e97ee: am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit '8ded7780c6658d6db011f642206726234098388f':
  hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

10 years agoam 3da0d0f4: am 662e97ee: am aea8c156: Merge "hardware/libhardware: convert LOCAL_MOD...
Colin Cross [Tue, 28 Jan 2014 01:03:07 +0000 (01:03 +0000)]
am 3da0d0f4: am 662e97ee: am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit '3da0d0f4c7a02cbb510d65def4e87eb31c97948b':
  hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

10 years agoam 662e97ee: am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH...
Colin Cross [Tue, 28 Jan 2014 00:58:41 +0000 (00:58 +0000)]
am 662e97ee: am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit '662e97eedbb36374e61dab50a7acb4b2bae29883':
  hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

10 years agoam aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_R...
Colin Cross [Tue, 28 Jan 2014 00:51:42 +0000 (00:51 +0000)]
am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit 'aea8c156649c16347514741eb084858cdb458b75':
  hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

10 years agoMerge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
Colin Cross [Tue, 28 Jan 2014 00:42:39 +0000 (00:42 +0000)]
Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

10 years agohardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
Colin Cross [Sat, 25 Jan 2014 05:00:32 +0000 (21:00 -0800)]
hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.

Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e

10 years agoam ae2e54fa: resolved conflicts for merge of 017649d6 to klp-modular-dev
David 'Digit' Turner [Thu, 23 Jan 2014 23:26:23 +0000 (23:26 +0000)]
am ae2e54fa: resolved conflicts for merge of 017649d6 to klp-modular-dev

* commit 'ae2e54faf71f4ff3d96216031c66d14dfbbceb5f':
  Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.

10 years agoresolved conflicts for merge of 017649d6 to klp-modular-dev
David 'Digit' Turner [Thu, 23 Jan 2014 22:34:45 +0000 (23:34 +0100)]
resolved conflicts for merge of 017649d6 to klp-modular-dev

Conflicts:
modules/Android.mk

Change-Id: I6b84d2320be98b6af1f0cab729a917cf84cd9524

10 years agoam c2f6dc45: am fa3d243b: Merge "Vibra: Adapt AOSP (default) vibrator HAL into a...
David Turner [Thu, 23 Jan 2014 20:29:23 +0000 (20:29 +0000)]
am c2f6dc45: am fa3d243b: Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."

* commit 'c2f6dc45643bd2b6251362ca4bc814d6601358d2':
  Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.

10 years agoam fa3d243b: Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."
David Turner [Thu, 23 Jan 2014 20:20:28 +0000 (12:20 -0800)]
am fa3d243b: Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."

* commit 'fa3d243b4690f2cc21d259e52178abf969cafc09':
  Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.

10 years agoMerge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."
David Turner [Thu, 23 Jan 2014 20:13:02 +0000 (20:13 +0000)]
Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."

10 years agocamera3: Add partial result processing in HAL3.2
Igor Murashkin [Fri, 10 Jan 2014 22:18:45 +0000 (14:18 -0800)]
camera3: Add partial result processing in HAL3.2

Change-Id: I665cf1191a1c7510671b3c171b47c167530c1067

10 years agocamera3: deprecate register_stream_buffers in hal 3.2
Igor Murashkin [Fri, 10 Jan 2014 00:23:43 +0000 (16:23 -0800)]
camera3: deprecate register_stream_buffers in hal 3.2

Change-Id: I7efabcba9b47846e831ffdf75ba1ea3c7e5ff629

10 years agocamera3: wording fix for KPI
Zhijun He [Fri, 17 Jan 2014 23:25:21 +0000 (15:25 -0800)]
camera3: wording fix for KPI

Change-Id: I4172fcdda3452eced663e332d509dea2594c1710

10 years agoCamera3: Add performance KPI requirement
Zhijun He [Thu, 9 Jan 2014 17:11:49 +0000 (09:11 -0800)]
Camera3: Add performance KPI requirement

Change-Id: I2133736b9e00b170200308982e591f311e1f04f7

10 years agoFix build. Missing vendor tags header.
Ruben Brunk [Fri, 17 Jan 2014 22:48:19 +0000 (14:48 -0800)]
Fix build.  Missing vendor tags header.

10 years agocamera3: Update vendor tag spec for HAL 3.2.
Ruben Brunk [Tue, 14 Jan 2014 23:27:58 +0000 (15:27 -0800)]
camera3: Update vendor tag spec for HAL 3.2.

- Deprecates vendor tag specification in camera3 device.
- Moves vendor tag ops declaration to camera metadata library and
  cleans up definitions.
- Updates the example HAL.

Change-Id: Ifb16bb0d4bbc896bc32d33dd150e7e174af57dad

10 years agoam 1ee5f5ef: Merge "BLE peripheral mode (1/4): change HAL to support service data...
Matthew Xie [Tue, 14 Jan 2014 20:46:37 +0000 (20:46 +0000)]
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.

10 years agoMerge "BLE peripheral mode (1/4): change HAL to support service data and service...
Matthew Xie [Tue, 14 Jan 2014 20:42:38 +0000 (20:42 +0000)]
Merge "BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-modular-dev

10 years agoam cd3f545e: am 260b0f50: am 2428eaa3: am a97c6fec: Merge "hardware: fix check for...
Colin Cross [Tue, 14 Jan 2014 08:06:29 +0000 (08:06 +0000)]
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

10 years agoam 260b0f50: am 2428eaa3: am a97c6fec: Merge "hardware: fix check for ro.hardware...
Colin Cross [Tue, 14 Jan 2014 08:03:28 +0000 (08:03 +0000)]
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

10 years agoam 2428eaa3: am a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"
Colin Cross [Tue, 14 Jan 2014 07:59:52 +0000 (07:59 +0000)]
am 2428eaa3: am a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"

* commit '2428eaa319bfd0481f49e364c4f242300f4ed291':
  hardware: fix check for ro.hardware.<class> property

10 years agoam a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"
Colin Cross [Tue, 14 Jan 2014 07:56:52 +0000 (23:56 -0800)]
am a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"

* commit 'a97c6fecdbe576b732a2ca00fbf4dcb82f079c8f':
  hardware: fix check for ro.hardware.<class> property

10 years agoMerge "hardware: fix check for ro.hardware.<class> property"
Colin Cross [Tue, 14 Jan 2014 07:52:15 +0000 (07:52 +0000)]
Merge "hardware: fix check for ro.hardware.<class> property"

10 years agohardware: fix check for ro.hardware.<class> property
Colin Cross [Tue, 14 Jan 2014 07:43:23 +0000 (23:43 -0800)]
hardware: fix check for ro.hardware.<class> property

Replace == with >, property_get returns the length of the
property if found.

Change-Id: I4b8fe8f8dba578112d21eee5dc64be4aa27f3bfb

10 years agoBLE peripheral mode (1/4): change HAL to support service data and service uuids.
Wei Wang [Wed, 6 Nov 2013 00:09:51 +0000 (16:09 -0800)]
BLE peripheral mode (1/4): change HAL to support service data and service uuids.

Change-Id: I19a3755a4ed16e1ae03368cecee97773c05c1770

10 years agoVibra: Adapt AOSP (default) vibrator HAL into a hardware module.
Vincent Becker [Fri, 10 Aug 2012 12:40:49 +0000 (14:40 +0200)]
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

10 years agoam 904812e1: am 728c78a4: am 7c2a4681: am e0c252ae: Merge "hardware: add ro.hardware...
Colin Cross [Thu, 2 Jan 2014 21:34:05 +0000 (21:34 +0000)]
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

10 years agoam 728c78a4: am 7c2a4681: am e0c252ae: Merge "hardware: add ro.hardware.<class> to...
Colin Cross [Thu, 2 Jan 2014 21:31:52 +0000 (21:31 +0000)]
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

10 years agoam 7c2a4681: am e0c252ae: Merge "hardware: add ro.hardware.<class> to HAL loading...
Colin Cross [Thu, 2 Jan 2014 21:28:41 +0000 (21:28 +0000)]
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

10 years agoam e0c252ae: Merge "hardware: add ro.hardware.<class> to HAL loading properites list"
Colin Cross [Thu, 2 Jan 2014 21:26:21 +0000 (13:26 -0800)]
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

10 years agoMerge "hardware: add ro.hardware.<class> to HAL loading properites list"
Colin Cross [Thu, 2 Jan 2014 21:21:35 +0000 (21:21 +0000)]
Merge "hardware: add ro.hardware.<class> to HAL loading properites list"

10 years agohardware: add ro.hardware.<class> to HAL loading properites list
Colin Cross [Thu, 26 Dec 2013 21:47:56 +0000 (13:47 -0800)]
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

10 years agoMerge "BLE peripheral mode (1/4): change HAL to support service data and service...
Wei Wang [Fri, 20 Dec 2013 19:37:33 +0000 (19:37 +0000)]
Merge "BLE peripheral mode (1/4): change HAL to support service data and service uuids."

10 years agoDocs: Removing contents now on source.android.com
Clay Murphy [Thu, 19 Dec 2013 17:58:28 +0000 (09:58 -0800)]
Docs: Removing contents now on source.android.com
Bug: 10134622

Change-Id: Ief5a53f1b5e5eff9ade45763d895029428266980

10 years agoBLE peripheral mode (1/4): change HAL to support service data and service uuids.
Wei Wang [Wed, 6 Nov 2013 00:09:51 +0000 (16:09 -0800)]
BLE peripheral mode (1/4): change HAL to support service data and service uuids.

Change-Id: I19a3755a4ed16e1ae03368cecee97773c05c1770

10 years agocamera3: Add manual control template
Zhijun He [Fri, 13 Dec 2013 23:56:33 +0000 (15:56 -0800)]
camera3: Add manual control template

Bug: 12134077
Change-Id: I0681f881f41dd3ab8acab400f84c2568a97e06bc

10 years agoam f49598e0: am 024c1534: Camera: HAL3: device test fixture and a test.
Sasha Levitskiy [Thu, 12 Dec 2013 23:28:16 +0000 (23:28 +0000)]
am f49598e0: am 024c1534: Camera: HAL3: device test fixture and a test.

* commit 'f49598e05886c0f71efad01c1aefb1a90e0b49d5':
  Camera: HAL3: device test fixture and a test.

10 years agoam 024c1534: Camera: HAL3: device test fixture and a test.
Sasha Levitskiy [Thu, 12 Dec 2013 23:25:26 +0000 (23:25 +0000)]
am 024c1534: Camera: HAL3: device test fixture and a test.

* commit '024c15346b00c2ac7d6b53e78422570bbc4245c7':
  Camera: HAL3: device test fixture and a test.

10 years agoCamera: HAL3: device test fixture and a test.
Sasha Levitskiy [Thu, 12 Dec 2013 22:08:55 +0000 (14:08 -0800)]
Camera: HAL3: device test fixture and a test.

Change-Id: Ifaec4be35e8f4fb80c8e71e24499fbcd40fddb6e
Signed-off-by: Sasha Levitskiy <sanek@google.com>
10 years agoam 44a61b2d: am 4a7b2171: Camera HAL3: first few unit tests.
Sasha Levitskiy [Thu, 12 Dec 2013 03:13:39 +0000 (03:13 +0000)]
am 44a61b2d: am 4a7b2171: Camera HAL3: first few unit tests.

* commit '44a61b2da0d1f348151dc7b82385aab582b1e429':
  Camera HAL3: first few unit tests.

10 years agoam 4a7b2171: Camera HAL3: first few unit tests.
Sasha Levitskiy [Thu, 12 Dec 2013 03:10:43 +0000 (03:10 +0000)]
am 4a7b2171: Camera HAL3: first few unit tests.

* commit '4a7b2171f00ba37e301105e8ea1f61dddaa4db3d':
  Camera HAL3: first few unit tests.

10 years agoCamera HAL3: first few unit tests.
Sasha Levitskiy [Tue, 10 Dec 2013 17:37:58 +0000 (09:37 -0800)]
Camera HAL3: first few unit tests.

Change-Id: I413dc447faadd4fd90986bc924722b2826e19382
Signed-off-by: Sasha Levitskiy <sanek@google.com>
10 years agoam f8477624: (-s ours) DO NOT MERGE: Sensor multi HAL
Mike Lockwood [Tue, 10 Dec 2013 18:43:41 +0000 (18:43 +0000)]
am f8477624: (-s ours) DO NOT MERGE: Sensor multi HAL

* commit 'f84776247777ca8710eca8a911f607e10256cc7d':
  DO NOT MERGE: Sensor multi HAL

10 years agoam 0bd030b5: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev
Qiwen Zhao [Tue, 10 Dec 2013 18:43:40 +0000 (18:43 +0000)]
am 0bd030b5: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev

* commit '0bd030b5df7381949ff368f15ebca214560fbf22':

10 years agoDO NOT MERGE: Sensor multi HAL
Mike Lockwood [Thu, 17 Oct 2013 15:05:00 +0000 (08:05 -0700)]
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

10 years agoDO NOT MERGE reset to goog/klp-volantis-dev
Qiwen Zhao [Mon, 9 Dec 2013 22:19:06 +0000 (14:19 -0800)]
DO NOT MERGE reset to goog/klp-volantis-dev

10 years agoam 888e507b: (-s ours) snap to klp-dev-plus-aosp 19b13b9 with history
Qiwen Zhao [Fri, 6 Dec 2013 22:19:20 +0000 (22:19 +0000)]
am 888e507b: (-s ours) snap to klp-dev-plus-aosp 19b13b9 with history

* commit '888e507b9756d0a572944ee81e80ffa08797b79d':

10 years agosnap to klp-dev-plus-aosp 19b13b9 with history
Qiwen Zhao [Fri, 6 Dec 2013 21:30:37 +0000 (13:30 -0800)]
snap to klp-dev-plus-aosp 19b13b9 with history

10 years agoam 19b13b9a: am 20ebefd9: Merge commit \'eed5dceb4a0bc02f50f236ab191d30c49c58f610...
The Android Open Source Project [Fri, 6 Dec 2013 01:38:46 +0000 (01:38 +0000)]
am 19b13b9a: am 20ebefd9: Merge commit \'eed5dceb4a0bc02f50f236ab191d30c49c58f610\' into HEAD

* commit '19b13b9a4545ff3974b6a9a620f7266b3a0a2c67':

10 years agoam 20ebefd9: Merge commit \'eed5dceb4a0bc02f50f236ab191d30c49c58f610\' into HEAD
The Android Open Source Project [Fri, 6 Dec 2013 01:25:49 +0000 (17:25 -0800)]
am 20ebefd9: Merge commit \'eed5dceb4a0bc02f50f236ab191d30c49c58f610\' into HEAD

* commit '20ebefd966eed9da545ab645199c2f93ca93af20':

10 years agoam 0bae43dc: (-s ours) DO NOT MERGE: Sensor multi HAL
Mike Lockwood [Thu, 5 Dec 2013 22:44:56 +0000 (22:44 +0000)]
am 0bae43dc: (-s ours) DO NOT MERGE: Sensor multi HAL

* commit '0bae43dc59372a84ffe0c1e57af68076dffab73a':
  DO NOT MERGE: Sensor multi HAL

10 years agoMerge "modules: camera: replace pthread mutex with utils'"
Alex Ray [Thu, 5 Dec 2013 22:17:06 +0000 (22:17 +0000)]
Merge "modules: camera: replace pthread mutex with utils'"

10 years agoMerge commit 'eed5dceb4a0bc02f50f236ab191d30c49c58f610' into HEAD
The Android Open Source Project [Thu, 5 Dec 2013 20:38:20 +0000 (12:38 -0800)]
Merge commit 'eed5dceb4a0bc02f50f236ab191d30c49c58f610' into HEAD

10 years agoDO NOT MERGE: Sensor multi HAL
Mike Lockwood [Thu, 17 Oct 2013 15:05:00 +0000 (08:05 -0700)]
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

10 years agoam e735e5fa: am 047510b1: Merge "gralloc: delete unused mutex declaration"
Rom Lemarchand [Wed, 27 Nov 2013 18:32:10 +0000 (10:32 -0800)]
am e735e5fa: am 047510b1: Merge "gralloc: delete unused mutex declaration"

* commit 'e735e5fa42f62d856e6c86d7ee785bb9797b6750':
  gralloc: delete unused mutex declaration

10 years agoam 047510b1: Merge "gralloc: delete unused mutex declaration"
Rom Lemarchand [Tue, 26 Nov 2013 18:37:58 +0000 (10:37 -0800)]
am 047510b1: Merge "gralloc: delete unused mutex declaration"

* commit '047510b132e33c26607b4b93e806884aa4d13f19':
  gralloc: delete unused mutex declaration

10 years agoMerge "gralloc: delete unused mutex declaration"
Rom Lemarchand [Tue, 26 Nov 2013 18:30:33 +0000 (18:30 +0000)]
Merge "gralloc: delete unused mutex declaration"

10 years agogralloc: delete unused mutex declaration
Rom Lemarchand [Tue, 26 Nov 2013 18:01:25 +0000 (10:01 -0800)]
gralloc: delete unused mutex declaration

Change-Id: Ibc7e70887b61f7dd885c86d412387636d3a6a867

10 years agoMerge changes Ib623f1a5,I058c963d,I63f00004
Rom Lemarchand [Sun, 24 Nov 2013 18:31:05 +0000 (18:31 +0000)]
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

10 years agoam dbf6b345: am bae5cf92: Merge commit \'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0...
The Android Open Source Project [Sat, 23 Nov 2013 03:31:25 +0000 (19:31 -0800)]
am dbf6b345: am bae5cf92: Merge commit \'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0\' into HEAD

* commit 'dbf6b34587293fa07534cbcfbb6032bab6a975b2':

10 years agoHAL test: statically test the last member of structs
Rom Lemarchand [Fri, 22 Nov 2013 23:26:48 +0000 (15:26 -0800)]
HAL test: statically test the last member of structs

Ensure the last member of structs is actually the one we expect

Change-Id: Ib623f1a5e09fd9b8d464456528a94742b0ccd00b

10 years agoHAL test: statically test the offsets of known struct members
Rom Lemarchand [Fri, 22 Nov 2013 22:59:54 +0000 (14:59 -0800)]
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

10 years agoam bae5cf92: Merge commit \'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0\' into HEAD
The Android Open Source Project [Sat, 23 Nov 2013 01:41:01 +0000 (17:41 -0800)]
am bae5cf92: Merge commit \'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0\' into HEAD

* commit 'bae5cf92cfa9e2867af91057265df7f029f7865e':

10 years agoMerge commit 'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0' into HEAD
The Android Open Source Project [Fri, 22 Nov 2013 18:35:26 +0000 (10:35 -0800)]
Merge commit 'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0' into HEAD

10 years agoHAL test: statically test the size of HAL structs
Rom Lemarchand [Thu, 21 Nov 2013 18:24:52 +0000 (10:24 -0800)]
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

10 years agoRemoved unneeded linux/input.h includes, to fix Mac SDK build
Aaron Whyte [Fri, 15 Nov 2013 03:15:25 +0000 (19:15 -0800)]
Removed unneeded linux/input.h includes, to fix Mac SDK build

Change-Id: I3bcfadb9c95a9239d8098989c60d5604bfdfb66f

10 years agodeactivated multihal logspam, made warnings warnings, left critical startup info
Aaron Whyte [Thu, 31 Oct 2013 22:50:36 +0000 (15:50 -0700)]
deactivated multihal logspam, made warnings warnings, left critical startup info

Change-Id: I6a53cef28ab87ca0d7f4668070e4d93ff726cf0d

10 years agoTests SensorEventQueue I/O when the queue is full.
Aaron Whyte [Tue, 29 Oct 2013 22:17:01 +0000 (15:17 -0700)]
Tests SensorEventQueue I/O when the queue is full.
Reduced debug logging in multihal.

Change-Id: I30e80630ce5d97776c53f26d6096ef59b9b2f35a

10 years agoMultiHal multithreaded polling
Aaron Whyte [Tue, 29 Oct 2013 00:18:06 +0000 (17:18 -0700)]
MultiHal multithreaded polling

Change-Id: I3ebe380169eed1c8deeca2860d1788be6c14837e

10 years agoAdded a SensorEventQueue, a circular buffer meant for reading with one thread
Aaron Whyte [Wed, 23 Oct 2013 00:17:17 +0000 (17:17 -0700)]
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.

Change-Id: I58418d69eebebeb96befb08ba3aed080f0f08551

10 years agoMove sensors multi HAL to libhardware
Mike Lockwood [Thu, 17 Oct 2013 15:05:00 +0000 (08:05 -0700)]
Move sensors multi HAL to libhardware

Change-Id: I12ba76291990264a2db61069f9610c40e96a9695

10 years agoam eed5dceb: am 7ccf148f: Update HWC documentation for virtual displays
Jesse Hall [Thu, 14 Nov 2013 02:48:17 +0000 (18:48 -0800)]
am eed5dceb: am 7ccf148f: Update HWC documentation for virtual displays

* commit 'eed5dceb4a0bc02f50f236ab191d30c49c58f610':
  Update HWC documentation for virtual displays

10 years agoam 7ccf148f: Update HWC documentation for virtual displays
Jesse Hall [Thu, 14 Nov 2013 01:04:25 +0000 (17:04 -0800)]
am 7ccf148f: Update HWC documentation for virtual displays

* commit '7ccf148f5066ceb1a161f0d7a7d66f75c6e8d420':
  Update HWC documentation for virtual displays

10 years agoUpdate HWC documentation for virtual displays
Jesse Hall [Wed, 13 Nov 2013 22:48:15 +0000 (14:48 -0800)]
Update HWC documentation for virtual displays

Bug: 8316155
Change-Id: I56598551b07082bfff90df160b103a4158e8c8c9

10 years agomodules: camera: replace pthread mutex with utils'
Alex Ray [Tue, 12 Nov 2013 20:58:39 +0000 (12:58 -0800)]
modules: camera: replace pthread mutex with utils'

Change-Id: Id974e4cc743d27d59634023cfdbba545fbb64e5f

10 years agoFix typo in the Supl interface name
destradaa [Thu, 7 Nov 2013 21:47:59 +0000 (13:47 -0800)]
Fix typo in the Supl interface name

Change-Id: I37b928f2da4fc6b6947bba87269ac7ee09f8bbcc

10 years agoam 15f0d47d: am af822c43: Merge "gralloc: do not use GNU old-style field designators"
Nick Kralevich [Thu, 7 Nov 2013 03:42:41 +0000 (19:42 -0800)]
am 15f0d47d: am af822c43: Merge "gralloc: do not use GNU old-style field designators"

* commit '15f0d47dc6611150be34bc98a8f328df53c93397':
  gralloc: do not use GNU old-style field designators

10 years agoam af822c43: Merge "gralloc: do not use GNU old-style field designators"
Nick Kralevich [Thu, 7 Nov 2013 03:40:57 +0000 (19:40 -0800)]
am af822c43: Merge "gralloc: do not use GNU old-style field designators"

* commit 'af822c43cf144a991db49d8c25068d054265ae37':
  gralloc: do not use GNU old-style field designators

10 years agoMerge "gralloc: do not use GNU old-style field designators"
Nick Kralevich [Thu, 7 Nov 2013 03:34:27 +0000 (03:34 +0000)]
Merge "gralloc: do not use GNU old-style field designators"

10 years agogralloc: do not use GNU old-style field designators
synergy dev [Thu, 7 Nov 2013 01:27:44 +0000 (17:27 -0800)]
gralloc: do not use GNU old-style field designators

Avoiding the use of gnu extensions improves code portability

Change-Id: Icf8e3d4813bcddff40548bb5e65e615f8697b75c

10 years agoMerge "modules: camera: Metadata refactor"
Alex Ray [Thu, 31 Oct 2013 17:15:27 +0000 (17:15 +0000)]
Merge "modules: camera: Metadata refactor"

10 years agoam fc2a7951: am b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devices
Zhijun He [Wed, 30 Oct 2013 01:39:53 +0000 (18:39 -0700)]
am fc2a7951: am b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devices

* commit 'fc2a7951518b4d39ea88b599ba37cc9ec57418dd':
  Camera2 Test: Skip CameraModuleTest for HAL V1 devices

10 years agoam b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devices
Zhijun He [Wed, 30 Oct 2013 01:37:02 +0000 (18:37 -0700)]
am b44ff650: Camera2 Test: Skip CameraModuleTest for HAL V1 devices

* commit 'b44ff6508bbcb8df751b5815dd4dfbd4cae252f7':
  Camera2 Test: Skip CameraModuleTest for HAL V1 devices

10 years agoCamera2 Test: Skip CameraModuleTest for HAL V1 devices
Zhijun He [Mon, 28 Oct 2013 22:52:56 +0000 (15:52 -0700)]
Camera2 Test: Skip CameraModuleTest for HAL V1 devices

Bug: 10971907
Change-Id: Ia3aa0e370d7eb5de6bb1fb7ff48a71ea5605fa17

10 years agomodules: camera: Metadata refactor
Alex Ray [Mon, 21 Oct 2013 19:55:24 +0000 (12:55 -0700)]
modules: camera: Metadata refactor

Add* functions const to protect data being added.
Initiailze metadata object from a camera_metadata_t.
Remove template-specific constructor.
Add convenience "add1" method to abvoid stack-allocated data.
Construct templates manually (in ExampleCamera) from base.

Change-Id: I3201f61e9d32841ea7a769d69242b40d8727c02e

10 years agoAdd new HAL for programable NFC tags
Benoit Goby [Fri, 11 Oct 2013 00:39:24 +0000 (17:39 -0700)]
Add new HAL for programable NFC tags

Change-Id: Ia904cae0ac371650c96cef1d13ab811889620092

10 years agomodules: camera: dump device and stream state
Alex Ray [Mon, 21 Oct 2013 07:46:44 +0000 (00:46 -0700)]
modules: camera: dump device and stream state

Change-Id: Iae3badba71f13784dfdd65d6e77b20283437935a

10 years agomodules: camera: add vendor tag functionality
Alex Ray [Fri, 18 Oct 2013 04:52:03 +0000 (21:52 -0700)]
modules: camera: add vendor tag functionality

Vendor Tag operations were added in module api v2.2

Change-Id: I352a50759d8bb9389d904bb774659e4be883794b

10 years agomodules: camera: Abstract device-specific camera
Alex Ray [Thu, 4 Jul 2013 00:54:19 +0000 (17:54 -0700)]
modules: camera: Abstract device-specific camera

ExampleCamera represents a specific (e.g. front or back) camera device,
and contains all the device and logic for that device/sensor.

Change-Id: Iecc1a1d905501a66edb6e3994ff93d8761b82f8b

10 years agoMerge "modules: camera: Add android.jpeg.maxSize metadata"
Alex Ray [Thu, 17 Oct 2013 21:40:32 +0000 (21:40 +0000)]
Merge "modules: camera: Add android.jpeg.maxSize metadata"

10 years agoMerge "modules: camera: Update trace headers to libutils"
Alex Ray [Thu, 17 Oct 2013 21:40:07 +0000 (21:40 +0000)]
Merge "modules: camera: Update trace headers to libutils"

10 years agomodules: camera: Add android.jpeg.maxSize metadata
Alex Ray [Mon, 14 Oct 2013 22:58:02 +0000 (15:58 -0700)]
modules: camera: Add android.jpeg.maxSize metadata

Change-Id: I0984b55df0adf8c60b07844003e97b5aac8ece3f

10 years agomodules: camera: Update trace headers to libutils
Alex Ray [Mon, 14 Oct 2013 22:56:43 +0000 (15:56 -0700)]
modules: camera: Update trace headers to libutils

Now that libutils is outside of frameworks, use that for c++-style
scoped tracing and remove the temporary shim header.

Change-Id: I913767aed8ff70abb9299e7a7b318b24a25e23c1

10 years agoUpdate to GpsHal to allow injection/revocation of certificates for SUPL connections.
destradaa [Fri, 13 Sep 2013 22:45:03 +0000 (15:45 -0700)]
Update to GpsHal to allow injection/revocation of certificates for SUPL connections.

Change-Id: I1fd432566623c4cebfb5b53e5f696ad359d49e6f

10 years agoam c9940a2b: am b0c30322: hardware: look in /vendor for default.so
Colin Cross [Wed, 2 Oct 2013 06:10:20 +0000 (23:10 -0700)]
am c9940a2b: am b0c30322: hardware: look in /vendor for default.so

* commit 'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0':
  hardware: look in /vendor for default.so

10 years agoam b0c30322: hardware: look in /vendor for default.so
Colin Cross [Wed, 2 Oct 2013 05:21:16 +0000 (22:21 -0700)]
am b0c30322: hardware: look in /vendor for default.so

* commit 'b0c303229fcbc89a0afa8f170de64f2a7fee9d6c':
  hardware: look in /vendor for default.so