Glenn Kasten
9f7332d442
am 5106ad0c
: Merge "Audio HALs are 32-bit only"
...
* commit '5106ad0c6e664a622d177d997d3ec7147ef1ae8f':
Audio HALs are 32-bit only
2014-03-13 18:19:04 +00:00
Glenn Kasten
5106ad0c6e
Merge "Audio HALs are 32-bit only"
2014-03-13 18:12:51 +00:00
Glenn Kasten
329b926633
Audio HALs are 32-bit only
...
Change-Id: I97eef87849312610d82bc3f82e168bb40604e646
2014-03-13 09:56:42 -07:00
Matthew Xie
faf51acb85
am 5d082f18
: Merge "Fix PAN control callback definition to match what bluedroid is doing."
...
* commit '5d082f1826cd5b72cd2a0eb0116c8a613d7555dd':
Fix PAN control callback definition to match what bluedroid is doing.
2014-03-11 18:52:02 +00:00
Jesse Hall
f8e6a30ab9
am 282ab1b6
: Merge "gralloc: dont hardcode 32bpp as RGBX"
...
* commit '282ab1b6b1a92b8cb2650c111bfab02916f8715d':
gralloc: dont hardcode 32bpp as RGBX
2014-03-11 18:36:24 +00:00
Greg Hackmann
0444d6942d
am b342abb6
: Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"
...
* commit 'b342abb6902a698963bb9d2108000da895845985':
gralloc: make private_handle_t layout consistent on 32/64-bit
2014-03-11 18:36:24 +00:00
Jinsuk Kim
cf39fcfc4b
am 98add895
: Add \'get_logical_address\' in HDMI-CEC HAL interface
...
* commit '98add8956b1a346425df40d2f70a9ca33500f01c':
Add 'get_logical_address' in HDMI-CEC HAL interface
2014-03-11 02:53:20 +00:00
Jinsuk Kim
98add8956b
Add 'get_logical_address' in HDMI-CEC HAL interface
...
The new function allows the HDMI-CEC service to get the logical address
updated by HAL implementation.
Change-Id: I1a4c5f7b7773279091d5bd7c6971a8c9090a81ca
2014-03-11 02:50:03 +00:00
Jinsuk Kim
18fd3c6e9d
am 355e5d68
: Merge "[HDMI-CEC] Modify the signature of register_event_callback" into klp-modular-dev
...
* commit '355e5d68021b272f692e5aa26f21fb4da57b3b93':
[HDMI-CEC] Modify the signature of register_event_callback
2014-03-11 01:46:34 +00:00
Jinsuk Kim
355e5d6802
Merge "[HDMI-CEC] Modify the signature of register_event_callback" into klp-modular-dev
2014-03-11 01:44:19 +00:00
Elliott Hughes
a225ca1f2b
am b96f1083
: Merge "Move libhardware of <asm/page.h>."
...
* commit 'b96f1083b8d10f3e33b64f0da943dedfdb25b557':
Move libhardware of <asm/page.h>.
2014-03-11 00:52:51 +00:00
Matthew Xie
b0a325a77c
am 5d082f18
: Merge "Fix PAN control callback definition to match what bluedroid is doing."
...
* commit '5d082f1826cd5b72cd2a0eb0116c8a613d7555dd':
Fix PAN control callback definition to match what bluedroid is doing.
2014-03-10 09:11:28 +00:00
Matthew Xie
5d082f1826
Merge "Fix PAN control callback definition to match what bluedroid is doing."
2014-03-10 07:54:28 +00:00
Wei Wang
590b308cef
am 56910cf5
: Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-dev
...
* commit '56910cf52332219c6a23bc12596b261c127d93bf':
DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.
2014-03-08 06:24:48 +00:00
Wei Wang
2aeee06bb4
am fc9be0a2
: am 56910cf5
: (-s ours) Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-dev
...
* commit 'fc9be0a2438fca7bd7e961a86fd8d17f14b52623':
DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.
2014-03-08 02:11:15 +00:00
Wei Wang
fc9be0a243
am 56910cf5
: (-s ours) Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-dev
...
* commit '56910cf52332219c6a23bc12596b261c127d93bf':
DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.
2014-03-08 02:07:29 +00:00
Wei Wang
56910cf523
Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-dev
2014-03-08 02:00:15 +00:00
Jinsuk Kim
70ae777c9a
[HDMI-CEC] Modify the signature of register_event_callback
...
Additional parameter helps the caller avoid managing a static instance
variable. The parameter is used to pass the caller object itself.
Change-Id: I06cbcc7736031678f4638a0b5082d7b6a7ea51b6
2014-03-08 06:15:49 +09:00
Colin Cross
b6ee567990
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-03-07 19:38:56 +00:00
David Turner
222f19d560
am f77bd7d0
: Merge "Try using goldfish_pipe as the device name"
...
* commit 'f77bd7d005e27364e233c92ac7f6c06a18d1f128':
Try using goldfish_pipe as the device name
2014-03-07 19:34:37 +00:00
Greg Hackmann
cc03474bc0
am f4c46752
: Merge "AArch64: Calculate private_handle_t\'s numInts"
...
* commit 'f4c46752df57be558773a056d6545877ef65c844':
AArch64: Calculate private_handle_t's numInts
2014-03-07 19:33:05 +00:00
Mike J. Chen
a043baa9c8
am 57ac9a9e
: Merge "Add handshake_callback to bt_hh" into klp-modular-dev
...
* commit '57ac9a9e96fb50dba33b05e9ffac1c9f5a1ada8f':
Add handshake_callback to bt_hh
2014-03-07 18:44:24 +00:00
Mike J. Chen
57ac9a9e96
Merge "Add handshake_callback to bt_hh" into klp-modular-dev
2014-03-07 18:40:57 +00:00
Amit Shekhar
cea3c679b1
am 1482406b
: usbaudio: fix for out->dev->lock remains locked in error case
...
* commit '1482406b70a254fc85d153a7066d7f90d724d195':
usbaudio: fix for out->dev->lock remains locked in error case
2014-03-07 18:30:36 +00:00
Colin Cross
519f688ce0
am 037335eb
: Merge "gralloc: fix warnings"
...
* commit '037335ebe826289445fd2ba14e95ff41d57ad928':
gralloc: fix warnings
2014-03-07 02:23:41 +00:00
Wei Wang
e5d76f7896
DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids.
...
Cherry picking ble advertising changes from master to KLP MR2.
b/13137996
Change-Id: I19a3755a4ed16e1ae03368cecee97773c05c1770
2014-03-07 01:54:08 +00:00
Amit Shekhar
9c19b5480f
am ee4e28c9
: am 1482406b
: usbaudio: fix for out->dev->lock remains locked in error case
...
* commit 'ee4e28c9ebc7f26a1a25d1042d5a941139055447':
usbaudio: fix for out->dev->lock remains locked in error case
2014-03-06 22:41:21 +00:00
Amit Shekhar
ee4e28c9eb
am 1482406b
: usbaudio: fix for out->dev->lock remains locked in error case
...
* commit '1482406b70a254fc85d153a7066d7f90d724d195':
usbaudio: fix for out->dev->lock remains locked in error case
2014-03-06 21:02:36 +00:00
Jesse Hall
8a90666ccc
am 282ab1b6
: Merge "gralloc: dont hardcode 32bpp as RGBX"
...
* commit '282ab1b6b1a92b8cb2650c111bfab02916f8715d':
gralloc: dont hardcode 32bpp as RGBX
2014-03-06 20:04:55 +00:00
Greg Hackmann
b3d1dda513
am b342abb6
: Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"
...
* commit 'b342abb6902a698963bb9d2108000da895845985':
gralloc: make private_handle_t layout consistent on 32/64-bit
2014-03-06 20:04:54 +00:00
Jesse Hall
282ab1b6b1
Merge "gralloc: dont hardcode 32bpp as RGBX"
2014-03-06 19:04:07 +00:00
Greg Hackmann
b342abb690
Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"
2014-03-06 18:24:48 +00:00
Amit Shekhar
1482406b70
usbaudio: fix for out->dev->lock remains locked in error case
...
out->dev->lock remains locked in error case in out_write()
Added pthread_mutex_unlock() in the error case
Bug: 12824374
Change-Id: Id467e3122008eb8128b42dfc0e9103600c1eef2d
Signed-off-by: Glenn Kasten <gkasten@google.com>
2014-03-06 08:56:51 -08:00
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