OSDN Git Service
Etienne Le Grand [Wed, 7 May 2014 01:17:27 +0000 (01:17 +0000)]
Merge "Add SENSOR_TYPE_WAKE_GESTURE in the sensor hal."
Etienne Le Grand [Tue, 6 May 2014 01:20:42 +0000 (18:20 -0700)]
Add SENSOR_TYPE_WAKE_GESTURE in the sensor hal.
Change-Id: Ia84dfe487bfdea227d5ae856f7e44b021dac1f19
Nick Vaccaro [Tue, 6 May 2014 17:45:55 +0000 (17:45 +0000)]
am
c7651350: am
d34ed32e: Change MultiHal API version to 1.1
* commit '
c76513507b4a081e80ebf9a441d04005bf94418a':
Change MultiHal API version to 1.1
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
Aravind Akella [Mon, 5 May 2014 22:47:52 +0000 (22:47 +0000)]
Merge "Define TILT sensor"
Aravind Akella [Wed, 30 Apr 2014 18:46:09 +0000 (11:46 -0700)]
Define TILT sensor
Change-Id: Ic3c223488aa4a0d66b07ae3065e59f8e2fe69ceb
Sasha Levitskiy [Wed, 30 Apr 2014 20:29:43 +0000 (13:29 -0700)]
Hardware: Fingerprint: HAL adds removed notification, normalizes names.
Change-Id: Id0a8e120043c00bf351aa1c9d3f0c06c2e4af947
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Bill Yi [Wed, 30 Apr 2014 12:50:20 +0000 (12:50 +0000)]
Bill Yi [Wed, 30 Apr 2014 00:59:02 +0000 (00:59 +0000)]
Jinsuk Kim [Tue, 29 Apr 2014 21:38:10 +0000 (21:38 +0000)]
am
85425cfe: am
c2a0b248: Merge "Update HDMI-CEC HAL interface definition" into klp-modular-dev
* commit '
85425cfe8937cc82722e6495b3eb4573db461eb7':
Update HDMI-CEC HAL interface definition
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
Glenn Kasten [Tue, 29 Apr 2014 21:15:10 +0000 (21:15 +0000)]
Merge "Add symbol AUDIO_PARAMETER_KEY_BT_SCO_WB"
Glenn Kasten [Tue, 29 Apr 2014 20:35:57 +0000 (13:35 -0700)]
Add symbol AUDIO_PARAMETER_KEY_BT_SCO_WB
Change-Id: Ib2cfef74a57467cb01b5e0c44af335f53791e348
Bill Yi [Tue, 29 Apr 2014 18:34:21 +0000 (11:34 -0700)]
Aravind Akella [Tue, 29 Apr 2014 17:26:00 +0000 (17:26 +0000)]
Merge "Activity Recognition HAL."
Mark Salyzyn [Tue, 29 Apr 2014 15:34:40 +0000 (15:34 +0000)]
Merge "USB HAL: 64-bit compile issues"
Aravind Akella [Sat, 15 Mar 2014 02:00:45 +0000 (19:00 -0700)]
Activity Recognition HAL.
Change-Id: I6fa175376464a4498fc9ed71dc33199be4754599
Zhijun He [Tue, 29 Apr 2014 01:12:45 +0000 (01:12 +0000)]
Merge "camera3: Update camera3_jpeg_blob_t for max jpeg size change"
Mark Salyzyn [Mon, 28 Apr 2014 19:30:44 +0000 (12:30 -0700)]
USB HAL: 64-bit compile issues
- size_t/ssize_t issues
- const warnings
- printf format (unsigned/signed and non-integer types)
Change-Id: I36d6b0d86e832b46eb0da076e99bf1f25bd697ff
Paul McLean [Mon, 28 Apr 2014 20:03:18 +0000 (13:03 -0700)]
Added support for 1-channel capture sources (like a microphone)
Change-Id: Ie38b41ed8a63bf1b813379361665c883f08cbaae
Zhijun He [Thu, 24 Apr 2014 21:34:53 +0000 (14:34 -0700)]
camera3: Update camera3_jpeg_blob_t for max jpeg size change
We no longer have a single max jpeg size for all resolution jpeg streams.
Bug:
14288983
Change-Id: I2c96d7c473901d7f419d0da9c2947fec095834a9
Paul McLean [Fri, 25 Apr 2014 19:20:59 +0000 (19:20 +0000)]
Merge "USB HAL Capture Implementation"
Paul McLean [Wed, 16 Apr 2014 22:44:20 +0000 (15:44 -0700)]
USB HAL Capture Implementation
Change-Id: Ic04f7e1b33b423e5169667700145b9cbdd9704a6
Sasha Levitskiy [Thu, 24 Apr 2014 16:52:47 +0000 (09:52 -0700)]
Hardware: Fingerprint: Fix structure name.
Change-Id: I7a2593837148ad80df970d89950f396c7704e71b
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Aravind Akella [Thu, 24 Apr 2014 00:41:18 +0000 (00:41 +0000)]
Merge "Define new wake_up sensors in sensors.h"
Aravind Akella [Sat, 1 Mar 2014 02:46:19 +0000 (18:46 -0800)]
Define new wake_up sensors in sensors.h
i) Define WAKE_UP sensors.
ii) Deprecate flags DRY_RUN and WAKE_UPON_FIFO_FULL.
iii) Define maxDelay and isWakeUpSensor flag in sensor_t.
Bug:
13251067
Change-Id: Ic474d90d05459b06e93094856423f6645b4bf58e
Sasha Levitskiy [Wed, 23 Apr 2014 19:34:44 +0000 (19:34 +0000)]
Merge "Hardware: Fingerprint: Fix the remove() argument, typos."
Sasha Levitskiy [Tue, 22 Apr 2014 00:20:17 +0000 (17:20 -0700)]
Camera: HAL: 64-bit warning fixit.
Change-Id: Iecc3e1846fbf63c51952d115e1f167cf32135b18
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Sasha Levitskiy [Wed, 23 Apr 2014 17:04:57 +0000 (10:04 -0700)]
Hardware: Fingerprint: Fix the remove() argument, typos.
Change-Id: I99e8e2f24f0264c2217d67a75fe437756596053c
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Sasha Levitskiy [Tue, 22 Apr 2014 21:35:50 +0000 (21:35 +0000)]
Merge "Hardware: Fingerprint: Move the HAL to an async model, add some vendor requested functionality."
Sasha Levitskiy [Fri, 18 Apr 2014 18:14:11 +0000 (11:14 -0700)]
Hardware: Fingerprint: Move the HAL to an async model, add some vendor requested functionality.
Change-Id: Ib99e3edb99579ac4495918eb57d1022d75dccb57
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Sasha Levitskiy [Mon, 21 Apr 2014 21:49:12 +0000 (14:49 -0700)]
Camera2: Tests: 64-bit warning fixit
Change-Id: Idb761d2bfd8f07838a194f986f7c0a06429f4049
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Colin Cross [Mon, 21 Apr 2014 15:59:26 +0000 (15:59 +0000)]
am
6322562d: am
c070bad4: Merge changes I672d4ee8,I6a2183b5,If0c0135e
* commit '
6322562d0f1387c08109f706f381a3818114f91f':
usbaudio: allow compiling for 64-bit
audio_remote_submix: allow compiling for 64-bit
audio: allow compiling for 64-bit
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:18:38 +0000 (21:18 +0000)]
am
2131c7c5: am
cb3a62ea: Merge "keymaster: add flags indicating feature support"
* commit '
2131c7c5999c2b32b8eedc888cad194f26442b8b':
keymaster: add flags indicating feature support
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, 25 Oct 2013 17:55:04 +0000 (10:55 -0700)]
keymaster: add flags indicating feature support
For wrapping the disk encryption secret, we add a flag that indicates it
can be done without having to start some storage daemon which the
trusted OS will query to get data needed to load up the keys. This
usually means that the "key blob" we store is actually just the RSA key
encrypted with the device's KEK and not a reference to an encrypted
filesystem stored on /data
Also to allow other providers to upgrade to V3 of the header, we add
flags to show whether the keymaster supports different key types. This
allows keymaster HALs to support the whole device encryption secret
wrapping without needing to implement DSA and EC key handling. The V2
header made support implicit.
(cherry picked from commit
8a3849e26f9c64314edb69586819250e8f95c1eb)
Change-Id: I49be8403faf9f4c3888c84848b3009b44ab6d183
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:36:13 +0000 (20:36 +0000)]
am
dbcec633: am
dd6e1a01: Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam." into klp-modular-dev
* commit '
dbcec633d3d9e7e63f287e39c691439424a9c288':
Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.
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:49:16 +0000 (19:49 +0000)]
am
311c8922: (-s ours) am
40208a8b: DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
* commit '
311c8922d7b9268b649eea4d6f578f3c65cab468':
DO NOT MERGE Fix PAN control callback definition to match what bluedroid is doing.
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 23:20:40 +0000 (23:20 +0000)]
am
da38fb2d: am
4d7ac52d: Fixed multihal handling of nonexistent sensor handles.
* commit '
da38fb2d13ceeee79a39146ca30e720e58572989':
Fixed multihal handling of nonexistent sensor handles.
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 21:06:22 +0000 (21:06 +0000)]
Merge "Remove offset checks for reserved fields in sensor_t and sensors_event_t."
Aravind Akella [Fri, 11 Apr 2014 20:45:49 +0000 (20:45 +0000)]
Remove offset checks for reserved fields in sensor_t and sensors_event_t.
This reverts commit
ea676f9ae6757018110532f424fa15df6704be0e.
Change-Id: I4c69b46f20fa3505e062363643711991e65d6cb4
Aravind Akella [Fri, 11 Apr 2014 20:31:52 +0000 (20:31 +0000)]
Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
Aravind Akella [Fri, 11 Apr 2014 19:40:33 +0000 (19:40 +0000)]
am
7e027537: (-s ours) am
d5b3c73d: Merge "DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
* commit '
7e02753740b3be3f7100b461e628ce2f0c1823f4':
DO NOT MERGE Add heart rate monitor, stringType and requiredPermissions to sensors.h
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
Wonsik Kim [Fri, 11 Apr 2014 04:23:53 +0000 (04:23 +0000)]
Merge "tv_input: add buffer producer profile"
Aravind Akella [Mon, 7 Apr 2014 22:46:01 +0000 (22:46 +0000)]
Add heart rate monitor, stringType and requiredPermissions to sensors.h
Merged and resolved conflicts with Ic66b792c8229867fa5ff760cdde3d7c6f3360296
Conflicts:
include/hardware/sensors.h
Change-Id: I47b7e5f16b50fd5272590f6daba4a9d6833b3afb
Jianing Wei [Thu, 10 Apr 2014 21:17:57 +0000 (14:17 -0700)]
Camera2 test: fix build break due to change in camera service.
Change-Id: If8785df9209c83ccd1454b89b46d5e885f897cae
Wonsik Kim [Tue, 1 Apr 2014 02:34:33 +0000 (11:34 +0900)]
tv_input: add buffer producer profile
Change-Id: Id86e282a06d6353f05d47a2f198bde0534d9dcf2
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
Dan Stoza [Tue, 8 Apr 2014 18:29:56 +0000 (18:29 +0000)]
Merge "Remove deprecated BufferQueue constructor"
Sasha Levitskiy [Mon, 7 Apr 2014 21:54:12 +0000 (14:54 -0700)]
Hardware: Fingerprint: Add current version.
Change-Id: I8025276da558d1bf07735cd9d71ba1586566dd07
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Dan Stoza [Mon, 7 Apr 2014 20:39:37 +0000 (13:39 -0700)]
Remove deprecated BufferQueue constructor
Bug:
13415624
Change-Id: Ia2ed4b5bc7289f8d8ab6e6a431746b43c81842bc
Sasha Levitskiy [Mon, 24 Mar 2014 23:14:42 +0000 (16:14 -0700)]
Hardware: Fingerprint: Introducing Fingerprint HAL
Change-Id: I4e55c42841c3b6a1327a16bdf6d1d4bb3847c7f3
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Etienne Le Grand [Sat, 5 Apr 2014 17:05:32 +0000 (17:05 +0000)]
am
e6bee250: (-s ours) am
71a50543: Merge "Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"" into klp-modular-dev
* commit '
e6bee250643159b835dd23f6837e360f4282d615':
Revert "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
Etienne Le Grand [Sat, 5 Apr 2014 17:00:03 +0000 (17:00 +0000)]
am
66fad0e3: (-s ours) am
61c78d98: Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h" into klp-modular-dev
* commit '
66fad0e3e7db1ca02fa0af968008ed02e47c593c':
Add heart rate monitor, stringType and requiredPermissions to sensors.h
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
JP Abgrall [Sat, 5 Apr 2014 04:48:39 +0000 (04:48 +0000)]
Merge "Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)""
Etienne Le Grand [Sat, 5 Apr 2014 04:48:27 +0000 (04:48 +0000)]
Merge "Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)""
Etienne Le Grand [Sat, 5 Apr 2014 04:48:21 +0000 (04:48 +0000)]
Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)"
This reverts commit
c6854530e1c707d86e4c2203354e66aa2ee8fdf4.
Change-Id: Idc821b6645be6bfd9878cfc777010a123f013f0a
JP Abgrall [Sat, 5 Apr 2014 04:47:55 +0000 (04:47 +0000)]
Revert "Fix Merge conflict (Add heart rate monitor ...to sensors.h)"
This reverts commit
c6854530e1c707d86e4c2203354e66aa2ee8fdf4.
Turns out more work in klp-something-something is needed.
So this needs undoing to get the builds fixed.
Change-Id: Ic38e2b312fa48c4489f54fc688fb0f1114c13d4a
Etienne Le Grand [Sat, 5 Apr 2014 04:47:01 +0000 (04:47 +0000)]
Merge "Revert "Remove offset checks for reserved fields in sensor_t and sensors_event_t.""
Etienne Le Grand [Sat, 5 Apr 2014 04:46:55 +0000 (04:46 +0000)]
Revert "Remove offset checks for reserved fields in sensor_t and sensors_event_t."
This reverts commit
4db220ec857c9166843a8d6fae9b52666c177168.
Change-Id: I61feb99c2024889e29e2b300ad4a4f5af1fdc282
JP Abgrall [Sat, 5 Apr 2014 03:51:05 +0000 (20:51 -0700)]
Fix Merge conflict (Add heart rate monitor ...to sensors.h)
Change-Id: I376e4dbb13d64f4987d4a8be82afddb625eefa54
Conflicts:
include/hardware/sensors.h
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
Aravind Akella [Sat, 5 Apr 2014 01:44:23 +0000 (01:44 +0000)]
Merge "Remove offset checks for reserved fields in sensor_t and sensors_event_t."
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
Aravind Akella [Sat, 5 Apr 2014 01:26:34 +0000 (18:26 -0700)]
Remove offset checks for reserved fields in sensor_t and sensors_event_t.
Change-Id: I3dcc4b4204932a73503ede45b188142b03dcdd31
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
Paul McLean [Tue, 1 Apr 2014 16:14:31 +0000 (16:14 +0000)]
Merge "Initial implementation of usb audio I/O"
Paul McLean [Thu, 19 Dec 2013 23:46:15 +0000 (15:46 -0800)]
Initial implementation of usb audio I/O
Change-Id: Ib82783f0b25887e2d34a24fde346cee5003d5b89
Zhihai Xu [Mon, 31 Mar 2014 21:32:05 +0000 (21:32 +0000)]
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)
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
Ruben Brunk [Mon, 31 Mar 2014 17:10:25 +0000 (17:10 +0000)]
Merge "hal3: Update documentation regarding hardware block operating modes."
Jinsuk Kim [Mon, 31 Mar 2014 01:50:58 +0000 (01:50 +0000)]
am
b9254286: am
3bc29d3e: Merge "Added message_abort and operand enums" into klp-modular-dev
* commit '
b9254286c980c6cd2bb3817d87f4695a96feefcc':
Added message_abort and operand enums
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:09:31 +0000 (01:09 +0000)]
am
ab140462: am
37de84bc: Merge "Camera2 Test: fix test criteria for exposure time"
* commit '
ab14046292922d1ad0df84f3231f1e8b6233b737':
Camera2 Test: fix test criteria for exposure time
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
OSDN Git Service
