JP Abgrall
c6854530e1
Fix Merge conflict (Add heart rate monitor ...to sensors.h)
...
Change-Id: I376e4dbb13d64f4987d4a8be82afddb625eefa54
Conflicts:
include/hardware/sensors.h
2014-04-04 20:51:05 -07:00
Zhihai Xu
876a50f74a
am ec580a3f
: am 925855b5
: Merge "LE: Add API to configure MTU for a given connection (1/4)" into klp-modular-dev
...
* commit 'ec580a3fd3cc9bc73099111b6afe7234e96b8a95':
LE: Add API to configure MTU for a given connection (1/4)
2014-03-31 21:32:05 +00: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
Ruben Brunk
aab88308f7
Merge "hal3: Update documentation regarding hardware block operating modes."
2014-03-31 17:10:25 +00:00
Jinsuk Kim
19c91b63ed
am b9254286
: am 3bc29d3e
: Merge "Added message_abort and operand enums" into klp-modular-dev
...
* commit 'b9254286c980c6cd2bb3817d87f4695a96feefcc':
Added message_abort and operand enums
2014-03-31 01:50:58 +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
Andy Hung
7a0ff2abdd
Merge "Add audio_alsaops.h"
2014-03-28 16:50:03 +00:00
Ruben Brunk
2d96c743e6
hal3: Update documentation regarding hardware block operating modes.
...
Change-Id: I27987a75cb80c67f7e9ae71c116a26963b25eccb
2014-03-27 17:56:17 -07:00
Andy Hung
d4752ab1b3
Add audio_alsaops.h
...
Used for tinyalsa related functions common to the audio hardware
layer.
Change-Id: Iae69caaa713b65bfeb6bdc1eeec5b31771f10edb
Signed-off-by: Andy Hung <hunga@google.com>
2014-03-27 15:14:32 -07: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
Wonsik Kim
0b78afb191
Initial commit of TV input HAL
...
HAL for physical TV input such as HDMI-in. The main purpose is to
provide sideband video stream source handle to feed SurfaceFlinger and
audio related information to feed AudioManager (TBD).
Change-Id: I8eeddcd6c63f6f8c0b1e7a87e9a6856baa9ceddd
2014-03-21 14:49:58 +09:00
Jesse Hall
200970e53d
Merge "Add HWC 1.4 with support for sideband video layers"
2014-03-11 19:02:32 +00:00
Jesse Hall
8c79c08578
Add HWC 1.4 with support for sideband video layers
...
Change-Id: Ie40668a8667e26f1d570a2f756f1178d0dcbbf5c
2014-03-11 12:02:11 -07:00
Jinsuk Kim
fdb746bc07
am cf39fcfc
: am 98add895
: Add \'get_logical_address\' in HDMI-CEC HAL interface
...
* commit 'cf39fcfc4b4ce944b840a7cc1df2244709b96093':
Add 'get_logical_address' in HDMI-CEC HAL interface
2014-03-11 02:57:14 +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
f166369ebf
am 18fd3c6e
: am 355e5d68
: Merge "[HDMI-CEC] Modify the signature of register_event_callback" into klp-modular-dev
...
* commit '18fd3c6e9db8f10c15e54b345ec8031c3d259b16':
[HDMI-CEC] Modify the signature of register_event_callback
2014-03-11 01:59:47 +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
ceaedebf53
am b0a325a7
: am 5d082f18
: Merge "Fix PAN control callback definition to match what bluedroid is doing."
...
* commit 'b0a325a77c126f0ad94ea7ac92eebc23e3956fdf':
Fix PAN control callback definition to match what bluedroid is doing.
2014-03-10 09:20:43 +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
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
d35b818e4f
am a043baa9
: am 57ac9a9e
: Merge "Add handshake_callback to bt_hh" into klp-modular-dev
...
* commit 'a043baa9c8ad46abb8708136d653d2a5f8d96359':
Add handshake_callback to bt_hh
2014-03-07 20:33:47 +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
Glenn Kasten
3f56a10cc3
Rename setStreamOutput to invalidateStream
...
And simplify by removing the unused I/O handle parameter 'output'.
Change-Id: Ie9c4df17a7378066312d4ed8790fda7a9125c95e
2014-02-28 11:55:58 -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
Jinsuk Kim
e920fe632c
am 055c209a
: am 5f9a7907
: Merge "Header file for HDMI-CEC HAL interface definition" into klp-modular-dev
...
* commit '055c209a15788ead2043e9fe162169df460d3a53':
Header file for HDMI-CEC HAL interface definition
2014-02-21 13:54:29 +00: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
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
David Turner
8ef59807d4
am b1d5760b
: am f77bd7d0
: Merge "Try using goldfish_pipe as the device name"
...
* commit 'b1d5760b08c0116f3e5cf33e21a4ff710cd3d7a4':
Try using goldfish_pipe as the device name
2014-02-14 17:35:53 +00: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
Eino-Ville Talvala
d3dead483c
Merge "camera3: Docs updates to line up with metadata changes"
2014-02-11 17:53:40 +00:00
Eino-Ville Talvala
c5bff0d955
camera3: Docs updates to line up with metadata changes
...
Change-Id: I3065c9f1d905a4e7d0bb6eef2b4556c81a0788fe
2014-02-10 16:43:26 -08:00
Zhijun He
06da1b3745
camera3: fix typo in camera open KPI
...
Change-Id: Ieefdc5a0f5159a3053e141075e71d268499746ed
2014-02-10 16:04:23 -08:00
Simon Wilson
bda5e3f226
am 7ad4534e
: am 907b20aa
: Initial version of the MCU HAL
...
* commit '7ad4534e1ee6ec9744392d23199049c16ed18159':
Initial version of the MCU HAL
2014-02-10 20:44:38 +00:00
Simon Wilson
907b20aa74
Initial version of the MCU HAL
...
Change-Id: Ic88da7e825b67ed64cde4eed3055022daabe9830
2014-02-07 18:07:39 -08:00
Zhijun He
ceac9e3651
camera3: Add input buffer field in capture result
...
For HAL3.2 or above, the HAL must return the input buffer in capture result
rather than capture request.
Change-Id: I0108cda1cdf51556d7273b2c3cfbaf0e6ecd1d76
2014-02-07 14:47:25 -08:00
Zhijun He
bc35868a6f
camera3: update BIDIRECTIONAL and INPUT stream specs
...
Also add the manual template to the version history.
Change-Id: I0a516ccbbd3600d69217502e19b267e2d3aa60e8
2014-02-04 17:05:56 -08:00
Zhijun He
06c72f6bd7
Merge "camera3: Update flush HAL API spec"
2014-02-04 01:04:16 +00:00
Zhijun He
2020ee299c
camera3: Add camera close KPI
...
Change-Id: I265750ade49c63beedd3d9d0f2b8e7b3d19cc38f
2014-02-03 13:21:13 -08:00
Zhijun He
5a5fbf489e
camera3: Update flush HAL API spec
...
Change-Id: I4e36dcc4445c2fae71fe4ce22a0f3b9a28abe1c0
2014-02-03 13:04:05 -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
David 'Digit' Turner
8690233d7a
am ae2e54fa
: resolved conflicts for merge of 017649d6
to klp-modular-dev
...
* commit 'ae2e54faf71f4ff3d96216031c66d14dfbbceb5f':
Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.
2014-01-23 23:26:23 +00: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