OSDN Git Service
Dmitry Grinberg [Fri, 23 May 2014 21:35:42 +0000 (21:35 +0000)]
am
19f3696f: bt: add interface function to provide wakelock access
* commit '
19f3696f852d6787076b70a7d31f5684ad2aa93f':
bt: add interface function to provide wakelock access
Dmitry Grinberg [Wed, 21 May 2014 22:59:27 +0000 (15:59 -0700)]
bt: add interface function to provide wakelock access
Change-Id: I7ea173aee49ae7fdfe81a24a9b3666efc1c29ed4
Nick Vaccaro [Thu, 15 May 2014 21:45:47 +0000 (21:45 +0000)]
am
ad70dc48: add /system/vendor/lib as valid search path for sensor HALs
* commit '
ad70dc482f044b1ef03ef1aa74b6e2c5a446d32b':
add /system/vendor/lib as valid search path for sensor HALs
Nick Vaccaro [Thu, 15 May 2014 21:14:43 +0000 (14:14 -0700)]
add /system/vendor/lib as valid search path for sensor HALs
MultiHal will now accept sensor HALs listed in the hals.conf file that
reside in either /system/lib/hw or /system/vendor/lib.
Bug:
14994424
Change-Id: I13f17352b97c36b97cfbcee8c9b6a0d2e1ed6dc3
Greg Hackmann [Mon, 12 May 2014 18:12:33 +0000 (18:12 +0000)]
am
6f91ded5: am
c63ec07b: Merge "gralloc: Add asynchronous lock/unlock API"
* commit '
6f91ded57bf133fbf572cde2f5623bb8289f7eaa':
gralloc: Add asynchronous lock/unlock API
Greg Hackmann [Mon, 12 May 2014 18:08:12 +0000 (18:08 +0000)]
am
c63ec07b: Merge "gralloc: Add asynchronous lock/unlock API"
* commit '
c63ec07b3ca11de8e0321a0875119427bb0bad86':
gralloc: Add asynchronous lock/unlock API
Greg Hackmann [Mon, 12 May 2014 18:01:55 +0000 (18:01 +0000)]
Merge "gralloc: Add asynchronous lock/unlock API"
Francis Hart [Tue, 1 Apr 2014 08:10:32 +0000 (11:10 +0300)]
gralloc: Add asynchronous lock/unlock API
The existing API exposed to clients for software lock/unlock forces the gralloc
implementation to complete these operations synchronously. This change adds new
entry points for lock/unlock functionality that is suited for use with Android's
explicit synchronisation concept. This provides scope for the gralloc module
to internally optimise the work it must do for lock/unlock and to hide this cost
from the client.
Change-Id: If4b1bb5490ab2b20d796214a7da8a96427cfe52d
Greg Hackmann [Fri, 9 May 2014 21:51:51 +0000 (21:51 +0000)]
am
06c19bd0: am
2d91d000: Merge "Revert "gralloc: Add asynchronous lock/unlock API""
* commit '
06c19bd047d63adcf99094f6f0dd17b58150bba6':
Revert "gralloc: Add asynchronous lock/unlock API"
Greg Hackmann [Fri, 9 May 2014 21:46:45 +0000 (21:46 +0000)]
am
2d91d000: Merge "Revert "gralloc: Add asynchronous lock/unlock API""
* commit '
2d91d000bce3db23ac51888d109c9f29272ea96a':
Revert "gralloc: Add asynchronous lock/unlock API"
Greg Hackmann [Fri, 9 May 2014 21:39:10 +0000 (21:39 +0000)]
Merge "Revert "gralloc: Add asynchronous lock/unlock API""
Greg Hackmann [Fri, 9 May 2014 21:36:14 +0000 (21:36 +0000)]
Revert "gralloc: Add asynchronous lock/unlock API"
This reverts commit
2861789f4febe67e39de449488681edf3e98b6e2.
Change-Id: I334b8ca9b9fdef510df514c18aabb6a593dfaa75
Greg Hackmann [Fri, 9 May 2014 21:13:17 +0000 (21:13 +0000)]
am
5a1ca138: am
e79f167e: Merge "gralloc: Add asynchronous lock/unlock API"
* commit '
5a1ca138be2e45284a3a5ad33977ee774a57a56d':
gralloc: Add asynchronous lock/unlock API
Greg Hackmann [Fri, 9 May 2014 21:08:39 +0000 (21:08 +0000)]
am
e79f167e: Merge "gralloc: Add asynchronous lock/unlock API"
* commit '
e79f167e4a997b92d2da8e14a8a78c557503b48a':
gralloc: Add asynchronous lock/unlock API
Greg Hackmann [Fri, 9 May 2014 21:02:07 +0000 (21:02 +0000)]
Merge "gralloc: Add asynchronous lock/unlock API"
Nick Vaccaro [Tue, 6 May 2014 17:42:28 +0000 (17:42 +0000)]
am
d34ed32e: Change MultiHal API version to 1.1
* commit '
d34ed32e06045c5a55b4d25247a98fa64c233bfe':
Change MultiHal API version to 1.1
Nick Vaccaro [Tue, 6 May 2014 00:23:21 +0000 (17:23 -0700)]
Change MultiHal API version to 1.1
Bug:
14451762
Change-Id: Id16fa71ae7382689ce141a92eb974b208e20327b
Francis Hart [Tue, 1 Apr 2014 08:10:32 +0000 (11:10 +0300)]
gralloc: Add asynchronous lock/unlock API
The existing API exposed to clients for software lock/unlock forces the gralloc
implementation to complete these operations synchronously. This change adds new
entry points for lock/unlock functionality that is suited for use with Android's
explicit synchronisation concept. This provides scope for the gralloc module
to internally optimise the work it must do for lock/unlock and to hide this cost
from the client.
Change-Id: I6c41f4a532b705fc76c7777b2f04ea293506b381
Bill Yi [Wed, 30 Apr 2014 00:59:02 +0000 (00:59 +0000)]
Jinsuk Kim [Tue, 29 Apr 2014 21:34:58 +0000 (21:34 +0000)]
am
c2a0b248: Merge "Update HDMI-CEC HAL interface definition" into klp-modular-dev
* commit '
c2a0b2484ab80351ad18fb0b8337a8150e656b93':
Update HDMI-CEC HAL interface definition
Jinsuk Kim [Tue, 29 Apr 2014 21:32:29 +0000 (21:32 +0000)]
Merge "Update HDMI-CEC HAL interface definition" into klp-modular-dev
Bill Yi [Tue, 29 Apr 2014 18:34:21 +0000 (11:34 -0700)]
Colin Cross [Mon, 21 Apr 2014 13:45:30 +0000 (13:45 +0000)]
am
c070bad4: Merge changes I672d4ee8,I6a2183b5,If0c0135e
* commit '
c070bad435799b4febdd2acf6be6c191f15f724e':
usbaudio: allow compiling for 64-bit
audio_remote_submix: allow compiling for 64-bit
audio: allow compiling for 64-bit
Colin Cross [Sat, 19 Apr 2014 00:11:28 +0000 (00:11 +0000)]
Merge changes I672d4ee8,I6a2183b5,If0c0135e
* changes:
usbaudio: allow compiling for 64-bit
audio_remote_submix: allow compiling for 64-bit
audio: allow compiling for 64-bit
Colin Cross [Fri, 18 Apr 2014 22:41:11 +0000 (15:41 -0700)]
usbaudio: allow compiling for 64-bit
Set -Wno-unused-parameter, which makes the directory warnings-clean
on 32-bit and 64-bit.
Remove LOCAL_32_BIT_ONLY.
Change-Id: I672d4ee8d9e70c75f9376ca60389af08f73166b8
Colin Cross [Fri, 18 Apr 2014 22:45:42 +0000 (15:45 -0700)]
audio_remote_submix: allow compiling for 64-bit
Fix a few 64-bit warnings and set -Wno-unused-parameter, which makes
the directory warnings-clean on 32-bit and 64-bit.
Remove LOCAL_32_BIT_ONLY.
Change-Id: I6a2183b5bb0cdf438a04de967995da7b1e2e3854
Colin Cross [Fri, 18 Apr 2014 22:41:11 +0000 (15:41 -0700)]
audio: allow compiling for 64-bit
Set -Wno-unused-parameter, which makes the directory warnings-clean
on 32-bit and 64-bit.
Remove LOCAL_32_BIT_ONLY.
Change-Id: If0c0135e57935d785a0f36b7d5187ac567c7e21c
Kenny Root [Fri, 18 Apr 2014 21:15:30 +0000 (21:15 +0000)]
am
cb3a62ea: Merge "keymaster: add flags indicating feature support"
* commit '
cb3a62ea2f9a08dbe83ff68685f6361a5d015345':
keymaster: add flags indicating feature support
Kenny Root [Fri, 18 Apr 2014 18:50:01 +0000 (18:50 +0000)]
Merge "keymaster: add flags indicating feature support"
Aaron Whyte [Wed, 16 Apr 2014 20:33:03 +0000 (20:33 +0000)]
am
dd6e1a01: Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam." into klp-modular-dev
* commit '
dd6e1a018e318d8f95d507a2b7fc54eaa0fcabf5':
Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.
Aaron Whyte [Wed, 16 Apr 2014 20:29:55 +0000 (20:29 +0000)]
Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam." into klp-modular-dev
Ariel Gertzenstein [Wed, 16 Apr 2014 19:44:42 +0000 (19:44 +0000)]
am
40208a8b: DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
* commit '
40208a8b2baf9629c12966e52f2f901b3019670c':
DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
Ariel Gertzenstein [Sat, 1 Feb 2014 21:31:39 +0000 (13:31 -0800)]
DO NOT MERGE 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
Aaron Whyte [Tue, 15 Apr 2014 22:41:38 +0000 (15:41 -0700)]
Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.
Bug:
14084750
Change-Id: I099aaaa24caf0213af373b5a600616674349ff95
Aaron Whyte [Tue, 15 Apr 2014 18:26:06 +0000 (18:26 +0000)]
am
4d7ac52d: Fixed multihal handling of nonexistent sensor handles.
* commit '
4d7ac52d75b725ff25d68416747bfd43bbbc065d':
Fixed multihal handling of nonexistent sensor handles.
Aaron Whyte [Wed, 9 Apr 2014 22:56:54 +0000 (15:56 -0700)]
Fixed multihal handling of nonexistent sensor handles.
This prevents crashes and undefined behavior when someone
calls sensor HAL methods with nonexistent handles.
It also adds checks and warnings if bad sensor HALs provide
garbage sensor handles in their sensor events.
Tested by making sure pedometer and tilt still work.
Bug:
13513595
Change-Id: Ie1489d3f2972bec82ee1c73189e532f6658d1eca
Jinsuk Kim [Thu, 10 Apr 2014 10:24:02 +0000 (19:24 +0900)]
Update HDMI-CEC HAL interface definition
Previously it was HAL that was responsible for the logical address
allocation. The address allocation logic itself is based on the algorithm
specified in the CEC standard, is dependent neither on vendor nor
on hardware. This CL replaces the method 'allocate_logical_address',
'get_logical_address' with 'add_logical_address', so that the common
allocation logic will be implemented in the cec service and can be used by
all vendors without having them put the same logic in all HAL
implementations. HAL is supposed to be passed the allocated address
and use it to configure the chipset in this new definition.
The change in the service that implements the address allocation logic
will be done in a follow up CL.
Also removed the description in 'get_version' about version number.
It needs not be in the description since it is an implementation detail.
Change-Id: I33f31580792785bec38b7bd6997f91b89bfbb500
Aravind Akella [Fri, 11 Apr 2014 19:34:53 +0000 (19:34 +0000)]
am
d5b3c73d: Merge "DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
* commit '
d5b3c73d80ec851296037d2c7ed011ac306eb2f5':
DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
Aravind Akella [Fri, 11 Apr 2014 19:32:14 +0000 (19:32 +0000)]
Merge "DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
Aravind Akella [Mon, 7 Apr 2014 22:46:01 +0000 (22:46 +0000)]
DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
This reverts commit
d27d819897dcae794d26d604c2334a76ef8b9558.
Change-Id: Ic66b792c8229867fa5ff760cdde3d7c6f3360296
Etienne Le Grand [Sat, 5 Apr 2014 09:05:55 +0000 (09:05 +0000)]
am
71a50543: Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"" into klp-modular-dev
* commit '
71a50543134b56055ab5be1262495bc3c7ec0c74':
Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
Etienne Le Grand [Sat, 5 Apr 2014 05:01:34 +0000 (05:01 +0000)]
Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"" into klp-modular-dev
Etienne Le Grand [Sat, 5 Apr 2014 05:01:27 +0000 (05:01 +0000)]
Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
This reverts commit
0b8ec4f71fa31cd6db33da5fefcebf2ecb6b6d7a.
Change-Id: I99051b6941cad570aef45ff568d1777f881fc33b
Etienne Le Grand [Sat, 5 Apr 2014 01:48:40 +0000 (01:48 +0000)]
am
61c78d98: Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
* commit '
61c78d9804625ea2ec56c855602682aaa7dd5a75':
Add heart rate monitor, stringType and requiredPermissions to sensors.h
Etienne Le Grand [Sat, 5 Apr 2014 01:44:19 +0000 (01:44 +0000)]
Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
Etienne Le Grand [Tue, 25 Mar 2014 04:34:05 +0000 (21:34 -0700)]
Add heart rate monitor, stringType and requiredPermissions to sensors.h
Change-Id: I376e4dbb13d64f4987d4a8be82afddb625eefa54
Zhihai Xu [Mon, 31 Mar 2014 21:25:03 +0000 (21:25 +0000)]
am
925855b5: Merge "LE: Add API to configure MTU for a given connection (1/4)" into klp-modular-dev
* commit '
925855b5de013cb709fb2d88d840f9c6e71cdcf6':
LE: Add API to configure MTU for a given connection (1/4)
Zhihai Xu [Mon, 31 Mar 2014 21:21:16 +0000 (21:21 +0000)]
Merge "LE: Add API to configure MTU for a given connection (1/4)" into klp-modular-dev
Jinsuk Kim [Mon, 31 Mar 2014 01:44:52 +0000 (01:44 +0000)]
am
3bc29d3e: Merge "Added message_abort and operand enums" into klp-modular-dev
* commit '
3bc29d3e0a08bee19a43a61ce77b1b86a1cda436':
Added message_abort and operand enums
Jinsuk Kim [Mon, 31 Mar 2014 01:40:00 +0000 (01:40 +0000)]
Merge "Added message_abort and operand enums" into klp-modular-dev
Eino-Ville Talvala [Sat, 29 Mar 2014 01:02:57 +0000 (01:02 +0000)]
am
37de84bc: Merge "Camera2 Test: fix test criteria for exposure time"
* commit '
37de84bc96f808601897bcd126b73fc839fd2c20':
Camera2 Test: fix test criteria for exposure time
Eino-Ville Talvala [Sat, 29 Mar 2014 00:55:56 +0000 (00:55 +0000)]
Merge "Camera2 Test: fix test criteria for exposure time"
Gaurav Batra [Sat, 29 Mar 2014 00:03:36 +0000 (17:03 -0700)]
Camera2 Test: fix test criteria for exposure time
Add some tolerance while testing requested exposure times against capture times.
Change-Id: I609e7819cde8ee466e152775781a6542e6686ded
Andre Eisenbach [Tue, 25 Mar 2014 13:30:05 +0000 (06:30 -0700)]
LE: Add API to configure MTU for a given connection (1/4)
bug:
13571470
Change-Id: Ia473998b714c3968c75565adeef20fef5656abb4
Nick Vaccaro [Tue, 25 Mar 2014 20:23:05 +0000 (20:23 +0000)]
am
93bf9964: Fix sensor multi hal crash when sub-HAL reports an error
* commit '
93bf99647b0d33dfe12deecef828b6bcb568cafe':
Fix sensor multi hal crash when sub-HAL reports an error
Jinsuk Kim [Mon, 24 Mar 2014 04:26:40 +0000 (13:26 +0900)]
Added message_abort and operand enums
Also clarfieid the method description (allocate_logical_address),
update method signatures to use more appropriate type.
Change-Id: Ie5d13969308e77ca19b3dbde682ca968337ab41b
Nick Vaccaro [Mon, 17 Mar 2014 20:05:09 +0000 (13:05 -0700)]
Fix sensor multi hal crash when sub-HAL reports an error
Fix a null pointer dereference bug that caused the multihal to crash
in an endless loop continuously trying to open a sensor HAL when it
reports back an error.
Change-Id: I6d82e8fdd9acde53f378a5fb3dfdb02c39d7b433
Glenn Kasten [Thu, 13 Mar 2014 23:18:56 +0000 (23:18 +0000)]
am
5106ad0c: Merge "Audio HALs are 32-bit only"
* commit '
5106ad0c6e664a622d177d997d3ec7147ef1ae8f':
Audio HALs are 32-bit only
Glenn Kasten [Thu, 13 Mar 2014 18:19:04 +0000 (18:19 +0000)]
am
5106ad0c: Merge "Audio HALs are 32-bit only"
* commit '
5106ad0c6e664a622d177d997d3ec7147ef1ae8f':
Audio HALs are 32-bit only
Glenn Kasten [Thu, 13 Mar 2014 18:12:51 +0000 (18:12 +0000)]
Merge "Audio HALs are 32-bit only"
Glenn Kasten [Thu, 13 Mar 2014 16:55:04 +0000 (09:55 -0700)]
Audio HALs are 32-bit only
Change-Id: I97eef87849312610d82bc3f82e168bb40604e646
Matthew Xie [Tue, 11 Mar 2014 18:52:02 +0000 (18:52 +0000)]
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.
Jesse Hall [Tue, 11 Mar 2014 18:36:24 +0000 (18:36 +0000)]
am
282ab1b6: Merge "gralloc: dont hardcode 32bpp as RGBX"
* commit '
282ab1b6b1a92b8cb2650c111bfab02916f8715d':
gralloc: dont hardcode 32bpp as RGBX
Greg Hackmann [Tue, 11 Mar 2014 18:36:24 +0000 (18:36 +0000)]
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
Jinsuk Kim [Tue, 11 Mar 2014 02:53:20 +0000 (02:53 +0000)]
am
98add895: Add \'get_logical_address\' in HDMI-CEC HAL interface
* commit '
98add8956b1a346425df40d2f70a9ca33500f01c':
Add 'get_logical_address' in HDMI-CEC HAL interface
Jinsuk Kim [Wed, 5 Mar 2014 09:08:02 +0000 (18:08 +0900)]
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
Jinsuk Kim [Tue, 11 Mar 2014 01:46:34 +0000 (01:46 +0000)]
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
Jinsuk Kim [Tue, 11 Mar 2014 01:44:19 +0000 (01:44 +0000)]
Merge "[HDMI-CEC] Modify the signature of register_event_callback" into klp-modular-dev
Elliott Hughes [Tue, 11 Mar 2014 00:52:51 +0000 (00:52 +0000)]
am
b96f1083: Merge "Move libhardware of <asm/page.h>."
* commit '
b96f1083b8d10f3e33b64f0da943dedfdb25b557':
Move libhardware of <asm/page.h>.
Matthew Xie [Mon, 10 Mar 2014 09:11:28 +0000 (09:11 +0000)]
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.
Matthew Xie [Mon, 10 Mar 2014 07:54:28 +0000 (07:54 +0000)]
Merge "Fix PAN control callback definition to match what bluedroid is doing."
Wei Wang [Sat, 8 Mar 2014 06:24:48 +0000 (06:24 +0000)]
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.
Wei Wang [Sat, 8 Mar 2014 02:11:15 +0000 (02:11 +0000)]
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.
Wei Wang [Sat, 8 Mar 2014 02:07:29 +0000 (02:07 +0000)]
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.
Wei Wang [Sat, 8 Mar 2014 02:00:13 +0000 (02:00 +0000)]
Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data and service uuids." into klp-dev
Jinsuk Kim [Thu, 6 Mar 2014 10:25:19 +0000 (19:25 +0900)]
[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
Colin Cross [Fri, 7 Mar 2014 19:38:56 +0000 (19:38 +0000)]
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
David Turner [Fri, 7 Mar 2014 19:34:37 +0000 (19:34 +0000)]
am
f77bd7d0: Merge "Try using goldfish_pipe as the device name"
* commit '
f77bd7d005e27364e233c92ac7f6c06a18d1f128':
Try using goldfish_pipe as the device name
Greg Hackmann [Fri, 7 Mar 2014 19:33:05 +0000 (19:33 +0000)]
am
f4c46752: Merge "AArch64: Calculate private_handle_t\'s numInts"
* commit '
f4c46752df57be558773a056d6545877ef65c844':
AArch64: Calculate private_handle_t's numInts
Mike J. Chen [Fri, 7 Mar 2014 18:44:24 +0000 (18:44 +0000)]
am
57ac9a9e: Merge "Add handshake_callback to bt_hh" into klp-modular-dev
* commit '
57ac9a9e96fb50dba33b05e9ffac1c9f5a1ada8f':
Add handshake_callback to bt_hh
Mike J. Chen [Fri, 7 Mar 2014 18:40:57 +0000 (18:40 +0000)]
Merge "Add handshake_callback to bt_hh" into klp-modular-dev
Amit Shekhar [Fri, 7 Mar 2014 18:30:36 +0000 (18:30 +0000)]
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
Colin Cross [Fri, 7 Mar 2014 02:23:41 +0000 (02:23 +0000)]
am
037335eb: Merge "gralloc: fix warnings"
* commit '
037335ebe826289445fd2ba14e95ff41d57ad928':
gralloc: fix warnings
Wei Wang [Wed, 6 Nov 2013 00:09:51 +0000 (16:09 -0800)]
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
Amit Shekhar [Thu, 6 Mar 2014 22:41:21 +0000 (22:41 +0000)]
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
Amit Shekhar [Thu, 6 Mar 2014 21:02:36 +0000 (21:02 +0000)]
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
Jesse Hall [Thu, 6 Mar 2014 20:04:55 +0000 (20:04 +0000)]
am
282ab1b6: Merge "gralloc: dont hardcode 32bpp as RGBX"
* commit '
282ab1b6b1a92b8cb2650c111bfab02916f8715d':
gralloc: dont hardcode 32bpp as RGBX
Greg Hackmann [Thu, 6 Mar 2014 20:04:54 +0000 (20:04 +0000)]
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
Jesse Hall [Thu, 6 Mar 2014 19:04:07 +0000 (19:04 +0000)]
Merge "gralloc: dont hardcode 32bpp as RGBX"
Greg Hackmann [Thu, 6 Mar 2014 18:24:48 +0000 (18:24 +0000)]
Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"
Amit Shekhar [Thu, 30 Jan 2014 20:47:34 +0000 (12:47 -0800)]
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>
Greg Hackmann [Mon, 3 Mar 2014 21:10:15 +0000 (13:10 -0800)]
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>
Mike J. Chen [Wed, 26 Feb 2014 03:25:55 +0000 (19:25 -0800)]
Add handshake_callback to bt_hh
Change-Id: I505b1e56ee10c955eedff2e4d142cb7caa6b9fb2
Signed-off-by: Mike J. Chen <mjchen@google.com>
Elliott Hughes [Tue, 25 Feb 2014 00:06:51 +0000 (00:06 +0000)]
am
b96f1083: Merge "Move libhardware of <asm/page.h>."
* commit '
b96f1083b8d10f3e33b64f0da943dedfdb25b557':
Move libhardware of <asm/page.h>.
Elliott Hughes [Tue, 25 Feb 2014 00:01:47 +0000 (00:01 +0000)]
Merge "Move libhardware of <asm/page.h>."
Elliott Hughes [Mon, 24 Feb 2014 23:50:34 +0000 (15:50 -0800)]
Move libhardware of <asm/page.h>.
Change-Id: I7cf9d04828f19b8d7d1d3b8948bef580b101b10c
Bernhard Rosenkraenzer [Thu, 20 Feb 2014 20:08:44 +0000 (01:38 +0530)]
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>
Jinsuk Kim [Fri, 21 Feb 2014 01:30:35 +0000 (01:30 +0000)]
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
Jinsuk Kim [Fri, 21 Feb 2014 01:27:29 +0000 (01:27 +0000)]
Merge "Header file for HDMI-CEC HAL interface definition" into klp-modular-dev
Jinsuk Kim [Wed, 19 Feb 2014 01:21:35 +0000 (10:21 +0900)]
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
OSDN Git Service
