Commit graph

1393 commits

Author SHA1 Message Date
Greg Hackmann
f5811ba2df gralloc: make private_handle_t layout consistent on 32/64-bit
private_handle_t's memory layout must be consistent between the 32-bit
and 64-bit gralloc, in case buffers are passed between processes.
Replace the (variably sized) uintptr_t base with a fixed size uint64_t,
and enforce 8-byte alignment for architectures where uint64_t alignment
varies between 32-bit and 64-bit.

Change-Id: I06cb31d4b9620ea18e5b50d3a3142b5adb2d2a14
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2014-03-03 13:37:11 -08:00
Mike J. Chen
753c442217 Add handshake_callback to bt_hh
Change-Id: I505b1e56ee10c955eedff2e4d142cb7caa6b9fb2
Signed-off-by: Mike J. Chen <mjchen@google.com>
2014-02-25 19:25:55 -08:00
Elliott Hughes
abd0a90bc0 am b96f1083: Merge "Move libhardware of <asm/page.h>."
* commit 'b96f1083b8d10f3e33b64f0da943dedfdb25b557':
  Move libhardware of <asm/page.h>.
2014-02-25 00:06:51 +00:00
Elliott Hughes
b96f1083b8 Merge "Move libhardware of <asm/page.h>." 2014-02-25 00:01:48 +00:00
Elliott Hughes
6caa78dc37 Move libhardware of <asm/page.h>.
Change-Id: I7cf9d04828f19b8d7d1d3b8948bef580b101b10c
2014-02-24 15:50:34 -08:00
Bernhard Rosenkraenzer
5e3ac6bc71 gralloc: dont hardcode 32bpp as RGBX
Not every 32bpp is in RGBX format.

Change-Id: Ic3c6a0cbf475bff2fe2fc4b023c6bc58e4fc295e
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2014-02-21 19:28:56 +05:30
Jinsuk Kim
055c209a15 am 5f9a7907: Merge "Header file for HDMI-CEC HAL interface definition" into klp-modular-dev
* commit '5f9a7907844ba5319957dd9913ef951d78709afb':
  Header file for HDMI-CEC HAL interface definition
2014-02-21 01:30:35 +00:00
Jinsuk Kim
5f9a790784 Merge "Header file for HDMI-CEC HAL interface definition" into klp-modular-dev 2014-02-21 01:27:30 +00:00
Jinsuk Kim
62195dc9ac Header file for HDMI-CEC HAL interface definition
Added here is the header file that defines HDMI-CEC HAL interface.
Its main purpose is to support major CEC features such as 'one touch
play', 'standby' for playback device. But basic skeleton for supporting
other kinds of devices(like TV) is also in place.

Change-Id: Iccbbec398bc675d69cb78ad6848ec57ac727cb8d
2014-02-20 18:44:27 +09:00
Colin Cross
6c8ad5aa80 am 80d4eced: Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"
* commit '80d4eced69f4d1e9f9ef97b5f4f26868cd76ae26':
  Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
2014-02-16 18:42:54 +00:00
Colin Cross
80d4eced69 Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries" 2014-02-16 18:40:01 +00:00
Dan Willemsen
86389d1080 Use /(vendor|system)/lib64/hw for 64-bit HAL libraries
Change-Id: Ib905e079b1e88977fb3408671301904c58f35d3c
2014-02-16 10:07:15 -08:00
David Turner
b1d5760b08 am f77bd7d0: Merge "Try using goldfish_pipe as the device name"
* commit 'f77bd7d005e27364e233c92ac7f6c06a18d1f128':
  Try using goldfish_pipe as the device name
2014-02-14 17:27:21 +00:00
David Turner
f77bd7d005 Merge "Try using goldfish_pipe as the device name" 2014-02-14 16:34:25 +00:00
Greg Hackmann
f6d2142d93 am f4c46752: Merge "AArch64: Calculate private_handle_t\'s numInts"
* commit 'f4c46752df57be558773a056d6545877ef65c844':
  AArch64: Calculate private_handle_t's numInts
2014-02-13 20:46:21 +00:00
Greg Hackmann
f4c46752df Merge "AArch64: Calculate private_handle_t's numInts" 2014-02-13 20:41:18 +00:00
Simon Wilson
7ad4534e1e am 907b20aa: Initial version of the MCU HAL
* commit '907b20aa7475a91a148bb655b0d80cecabb130f6':
  Initial version of the MCU HAL
2014-02-10 20:38:51 +00:00
Simon Wilson
907b20aa74 Initial version of the MCU HAL
Change-Id: Ic88da7e825b67ed64cde4eed3055022daabe9830
2014-02-07 18:07:39 -08:00
Ashok Bhat
d2be74aa57 AArch64: Calculate private_handle_t's numInts
A constant sNumInts with a value of 6 was being assigned to the numInts
attribute in the private_handle_t constructor, and was also used in the
validate method. That constant value is appropriate for 32-bit systems
but is not appropriate for a 64-bit system where uintptr_t used for
base attribute will be 64-bit.

sNumInts is now changed to a static inline function that calculates
numInts.

Change-Id: I482ddb5915c9ff55fb2e2a87887a0ec2dc2299ed
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-07 17:52:08 +00:00
Colin Cross
5dbc98ff2c am 037335eb: Merge "gralloc: fix warnings"
* commit '037335ebe826289445fd2ba14e95ff41d57ad928':
  gralloc: fix warnings
2014-02-06 03:03:12 +00:00
Colin Cross
037335ebe8 Merge "gralloc: fix warnings" 2014-02-06 02:25:32 +00:00
Colin Cross
febaaa937f gralloc: fix warnings
Fix LP64 pointer casting warnings, unused parameters, and
turn off missing initializer warnings.

Change-Id: Idb70f4534282fed64ae81cb1e154d3f5b93091b0
2014-02-05 18:21:09 -08:00
Sharvil Nanavati
0932359d5b Fix PAN control callback definition to match what bluedroid is doing.
There's a discrepancy in the order of arguments between the interface
and the implementation. bluedroid swaps the |error| and |local_role|
arguments when calling back so this change redefines the interface
for consistency.

http://b/12853951

Change-Id: I0ccfc6d6d2002d647d484ab7f53744863b569502
2014-02-01 16:39:50 -08:00
Octavian Purdila
d3d041b7d1 Try using goldfish_pipe as the device name
The upstream goldfish_pipe driver uses goldfish_pipe as a name instead
of qemu_pipe. Try using this name if the old name (qemu_pipe) fails.

For: ABIT-15
Change-Id: I8c6178faf27b1cdb31cc4343cf1af396e929f7e4
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
2014-01-29 18:03:04 +08:00
Colin Cross
8ded7780c6 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
2014-01-28 01:03:07 +00:00
Colin Cross
3da0d0f4c7 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
2014-01-28 00:58:41 +00:00
Colin Cross
662e97eedb 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
2014-01-28 00:51:42 +00:00
Colin Cross
aea8c15664 Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" 2014-01-28 00:42:39 +00:00
Colin Cross
3557abaae2 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
2014-01-24 21:00:32 -08:00
David 'Digit' Turner
ae2e54faf7 resolved conflicts for merge of 017649d6 to klp-modular-dev
Conflicts:
	modules/Android.mk

Change-Id: I6b84d2320be98b6af1f0cab729a917cf84cd9524
2014-01-23 23:34:45 +01:00
David Turner
017649d62c 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.
2014-01-23 20:29:23 +00:00
David Turner
c2f6dc4564 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.
2014-01-23 12:20:28 -08:00
David Turner
fa3d243b46 Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module." 2014-01-23 20:13:03 +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
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
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
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
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