Commit graph

520 commits

Author SHA1 Message Date
Etienne Le Grand
ec9236ef18 am ef2c616c: Merge "Update definition of the heart rate monitor to include confidence" into klp-modular-dev
* commit 'ef2c616c4e45eaa1e621aa69bffb7438b1c64755':
  Update definition of the heart rate monitor to include confidence
2014-05-27 18:10:16 +00:00
Etienne Le Grand
ef2c616c4e Merge "Update definition of the heart rate monitor to include confidence" into klp-modular-dev 2014-05-27 18:03:06 +00:00
Dmitry Grinberg
b752c08d13 am 19f3696f: bt: add interface function to provide wakelock access
* commit '19f3696f852d6787076b70a7d31f5684ad2aa93f':
  bt: add interface function to provide wakelock access
2014-05-23 21:35:42 +00:00
Etienne Le Grand
7b36158da7 Update definition of the heart rate monitor to include confidence
Change-Id: I88a8cddf647f77588a283c16d37f3f99ecda3115
2014-05-23 13:07:08 -07:00
Dmitry Grinberg
19f3696f85 bt: add interface function to provide wakelock access
Change-Id: I7ea173aee49ae7fdfe81a24a9b3666efc1c29ed4
2014-05-22 19:26:25 -07:00
Greg Hackmann
7c05b1d8f9 am 6f91ded5: am c63ec07b: Merge "gralloc: Add asynchronous lock/unlock API"
* commit '6f91ded57bf133fbf572cde2f5623bb8289f7eaa':
  gralloc: Add asynchronous lock/unlock API
2014-05-12 18:12:33 +00:00
Greg Hackmann
6f91ded57b am c63ec07b: Merge "gralloc: Add asynchronous lock/unlock API"
* commit 'c63ec07b3ca11de8e0321a0875119427bb0bad86':
  gralloc: Add asynchronous lock/unlock API
2014-05-12 18:08:12 +00:00
Francis Hart
2e49f9acbb 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
2014-05-12 09:13:35 -07:00
Greg Hackmann
b283598bad am 06c19bd0: am 2d91d000: Merge "Revert "gralloc: Add asynchronous lock/unlock API""
* commit '06c19bd047d63adcf99094f6f0dd17b58150bba6':
  Revert "gralloc: Add asynchronous lock/unlock API"
2014-05-09 21:51:51 +00:00
Greg Hackmann
06c19bd047 am 2d91d000: Merge "Revert "gralloc: Add asynchronous lock/unlock API""
* commit '2d91d000bce3db23ac51888d109c9f29272ea96a':
  Revert "gralloc: Add asynchronous lock/unlock API"
2014-05-09 21:46:45 +00:00
Greg Hackmann
fd9dc63027 Revert "gralloc: Add asynchronous lock/unlock API"
This reverts commit 2861789f4f.

Change-Id: I334b8ca9b9fdef510df514c18aabb6a593dfaa75
2014-05-09 21:36:14 +00:00
Greg Hackmann
62cff27d48 am 5a1ca138: am e79f167e: Merge "gralloc: Add asynchronous lock/unlock API"
* commit '5a1ca138be2e45284a3a5ad33977ee774a57a56d':
  gralloc: Add asynchronous lock/unlock API
2014-05-09 21:13:17 +00:00
Greg Hackmann
5a1ca138be am e79f167e: Merge "gralloc: Add asynchronous lock/unlock API"
* commit 'e79f167e4a997b92d2da8e14a8a78c557503b48a':
  gralloc: Add asynchronous lock/unlock API
2014-05-09 21:08:39 +00:00
Francis Hart
2861789f4f 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
2014-05-02 19:46:58 +00:00
Jinsuk Kim
85425cfe89 am c2a0b248: Merge "Update HDMI-CEC HAL interface definition" into klp-modular-dev
* commit 'c2a0b2484ab80351ad18fb0b8337a8150e656b93':
  Update HDMI-CEC HAL interface definition
2014-04-29 21:34:58 +00:00
Jinsuk Kim
c2a0b2484a Merge "Update HDMI-CEC HAL interface definition" into klp-modular-dev 2014-04-29 21:32:30 +00:00
Bill Yi
08e9b2a43d Merge commit 'f404dc42d6677a1aee88d1ce996a7e8e4afe55bb' into HEAD 2014-04-29 11:34:21 -07:00
Kenny Root
2131c7c599 am cb3a62ea: Merge "keymaster: add flags indicating feature support"
* commit 'cb3a62ea2f9a08dbe83ff68685f6361a5d015345':
  keymaster: add flags indicating feature support
2014-04-18 21:15:30 +00:00
Kenny Root
cb3a62ea2f Merge "keymaster: add flags indicating feature support" 2014-04-18 18:50:01 +00:00
Ariel Gertzenstein
40208a8b2b 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
2014-04-16 14:53:45 -04:00
Jinsuk Kim
f02ed91f7a 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
2014-04-13 06:49:32 +09:00
Aravind Akella
7e02753740 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
2014-04-11 19:34:53 +00:00
Aravind Akella
d5b3c73d80 Merge "DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev 2014-04-11 19:32:14 +00:00
Aravind Akella
b20f1a3eaf DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
This reverts commit d27d819897.

Change-Id: Ic66b792c8229867fa5ff760cdde3d7c6f3360296
2014-04-08 18:55:50 +00:00
Etienne Le Grand
e6bee25064 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"
2014-04-05 09:05:55 +00:00
Etienne Le Grand
71a5054313 Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"" into klp-modular-dev 2014-04-05 05:01:34 +00:00
Etienne Le Grand
d27d819897 Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
This reverts commit 0b8ec4f71f.

Change-Id: I99051b6941cad570aef45ff568d1777f881fc33b
2014-04-05 05:01:27 +00:00
Etienne Le Grand
66fad0e3e7 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
2014-04-05 01:48:40 +00:00
Etienne Le Grand
61c78d9804 Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev 2014-04-05 01:44:19 +00:00
Etienne Le Grand
0b8ec4f71f Add heart rate monitor, stringType and requiredPermissions to sensors.h
Change-Id: I376e4dbb13d64f4987d4a8be82afddb625eefa54
2014-04-03 12:50:11 -07:00
Zhihai Xu
ec580a3fd3 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)
2014-03-31 21:25:03 +00:00
Zhihai Xu
925855b5de Merge "LE: Add API to configure MTU for a given connection (1/4)" into klp-modular-dev 2014-03-31 21:21:17 +00:00
Jinsuk Kim
b9254286c9 am 3bc29d3e: Merge "Added message_abort and operand enums" into klp-modular-dev
* commit '3bc29d3e0a08bee19a43a61ce77b1b86a1cda436':
  Added message_abort and operand enums
2014-03-31 01:44:52 +00:00
Andre Eisenbach
8a4b61a909 LE: Add API to configure MTU for a given connection (1/4)
bug:13571470
Change-Id: Ia473998b714c3968c75565adeef20fef5656abb4
2014-03-25 17:32:57 -07:00
Jinsuk Kim
efbdb25d1b 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
2014-03-24 13:43:47 +09: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
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
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
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
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
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
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
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