Zhijun He
50965dc0ea
Merge "camera3: Update camera3_jpeg_blob_t for max jpeg size change"
2014-04-29 01:12:45 +00:00
Mark Salyzyn
88e458ae61
USB HAL: 64-bit compile issues
...
- size_t/ssize_t issues
- const warnings
- printf format (unsigned/signed and non-integer types)
Change-Id: I36d6b0d86e832b46eb0da076e99bf1f25bd697ff
2014-04-28 16:47:58 -07:00
Paul McLean
cf61191774
Added support for 1-channel capture sources (like a microphone)
...
Change-Id: Ie38b41ed8a63bf1b813379361665c883f08cbaae
2014-04-28 14:59:02 -07:00
Zhijun He
44a8915187
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
2014-04-28 11:33:23 -07:00
Paul McLean
107f38b3e3
Merge "USB HAL Capture Implementation"
2014-04-25 19:21:00 +00:00
Paul McLean
30f4185da7
USB HAL Capture Implementation
...
Change-Id: Ic04f7e1b33b423e5169667700145b9cbdd9704a6
2014-04-24 15:47:24 -07:00
Sasha Levitskiy
cc14f23c97
Hardware: Fingerprint: Fix structure name.
...
Change-Id: I7a2593837148ad80df970d89950f396c7704e71b
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-24 09:52:47 -07:00
Aravind Akella
4fa0f418a3
Merge "Define new wake_up sensors in sensors.h"
2014-04-24 00:41:18 +00:00
Aravind Akella
6242f32a22
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
2014-04-23 16:09:24 -07:00
Sasha Levitskiy
69fad6c529
Merge "Hardware: Fingerprint: Fix the remove() argument, typos."
2014-04-23 19:34:44 +00:00
Sasha Levitskiy
a82f456c38
Camera: HAL: 64-bit warning fixit.
...
Change-Id: Iecc3e1846fbf63c51952d115e1f167cf32135b18
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-23 11:54:24 -07:00
Sasha Levitskiy
3b9ee8d82f
Hardware: Fingerprint: Fix the remove() argument, typos.
...
Change-Id: I99e8e2f24f0264c2217d67a75fe437756596053c
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-23 10:05:57 -07:00
Sasha Levitskiy
449ebdd70f
Merge "Hardware: Fingerprint: Move the HAL to an async model, add some vendor requested functionality."
2014-04-22 21:35:51 +00:00
Sasha Levitskiy
7308284e4e
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>
2014-04-22 10:50:50 -07:00
Sasha Levitskiy
0ab4c96ab8
Camera2: Tests: 64-bit warning fixit
...
Change-Id: Idb761d2bfd8f07838a194f986f7c0a06429f4049
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-21 14:50:01 -07:00
Colin Cross
747d0df39c
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
2014-04-21 15:59:26 +00:00
Colin Cross
6322562d0f
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
2014-04-21 13:45:30 +00:00
Colin Cross
c070bad435
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
2014-04-19 00:11:29 +00:00
Colin Cross
732b92a1d6
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
2014-04-18 15:50:32 -07:00
Colin Cross
5685a0845e
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
2014-04-18 15:46:46 -07:00
Colin Cross
0dbcdf3aff
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
2014-04-18 15:46:30 -07:00
Kenny Root
32853ed46b
am 2131c7c5
: am cb3a62ea
: Merge "keymaster: add flags indicating feature support"
...
* commit '2131c7c5999c2b32b8eedc888cad194f26442b8b':
keymaster: add flags indicating feature support
2014-04-18 21:18:38 +00: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
fea9aa6eb8
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 8a3849e26f
)
Change-Id: I49be8403faf9f4c3888c84848b3009b44ab6d183
2014-04-18 14:03:35 -07:00
Kenny Root
cb3a62ea2f
Merge "keymaster: add flags indicating feature support"
2014-04-18 18:50:01 +00:00
Aaron Whyte
1fbd8eff42
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.
2014-04-16 20:36:13 +00:00
Aaron Whyte
dbcec633d3
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.
2014-04-16 20:33:03 +00:00
Aaron Whyte
dd6e1a018e
Merge "Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam." into klp-modular-dev
2014-04-16 20:29:56 +00:00
Ariel Gertzenstein
9fe7e7a5b2
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.
2014-04-16 19:49:16 +00:00
Ariel Gertzenstein
311c8922d7
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.
2014-04-16 19:44:42 +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
Aaron Whyte
f22e1c1808
Reduced most MultiHal ALOGI to ALOGV, reducing bootup logspam.
...
Bug: 14084750
Change-Id: I099aaaa24caf0213af373b5a600616674349ff95
2014-04-15 16:22:05 -07:00
Aaron Whyte
d821ba71b2
am da38fb2d
: am 4d7ac52d
: Fixed multihal handling of nonexistent sensor handles.
...
* commit 'da38fb2d13ceeee79a39146ca30e720e58572989':
Fixed multihal handling of nonexistent sensor handles.
2014-04-15 23:20:40 +00:00
Aaron Whyte
da38fb2d13
am 4d7ac52d
: Fixed multihal handling of nonexistent sensor handles.
...
* commit '4d7ac52d75b725ff25d68416747bfd43bbbc065d':
Fixed multihal handling of nonexistent sensor handles.
2014-04-15 18:26:06 +00:00
Aaron Whyte
4d7ac52d75
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
2014-04-15 11:00:14 -07: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
04c1521d1e
Merge "Remove offset checks for reserved fields in sensor_t and sensors_event_t."
2014-04-11 21:06:22 +00:00
Aravind Akella
54770a5d8a
Remove offset checks for reserved fields in sensor_t and sensors_event_t.
...
This reverts commit ea676f9ae6
.
Change-Id: I4c69b46f20fa3505e062363643711991e65d6cb4
2014-04-11 20:45:49 +00:00
Aravind Akella
7b36316c33
Merge "Add heart rate monitor, stringType and requiredPermissions to sensors.h"
2014-04-11 20:31:53 +00:00
Aravind Akella
f2f0ea9cbc
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
2014-04-11 19:40:33 +00: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
Wonsik Kim
b8dc4abed1
Merge "tv_input: add buffer producer profile"
2014-04-11 04:23:54 +00:00
Aravind Akella
477fbd5c7d
Add heart rate monitor, stringType and requiredPermissions to sensors.h
...
Merged and resolved conflicts with Ic66b792c8229867fa5ff760cdde3d7c6f3360296
Conflicts:
include/hardware/sensors.h
Change-Id: I47b7e5f16b50fd5272590f6daba4a9d6833b3afb
2014-04-10 16:57:42 -07:00
Jianing Wei
f816eea8f1
Camera2 test: fix build break due to change in camera service.
...
Change-Id: If8785df9209c83ccd1454b89b46d5e885f897cae
2014-04-10 14:17:57 -07:00
Wonsik Kim
dce529a148
tv_input: add buffer producer profile
...
Change-Id: Id86e282a06d6353f05d47a2f198bde0534d9dcf2
2014-04-09 21:30:04 +09: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
Dan Stoza
692231f348
Merge "Remove deprecated BufferQueue constructor"
2014-04-08 18:29:56 +00:00
Sasha Levitskiy
46781fd8f6
Hardware: Fingerprint: Add current version.
...
Change-Id: I8025276da558d1bf07735cd9d71ba1586566dd07
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-04-07 14:54:42 -07:00
Dan Stoza
5dce9e4f26
Remove deprecated BufferQueue constructor
...
Bug: 13415624
Change-Id: Ia2ed4b5bc7289f8d8ab6e6a431746b43c81842bc
2014-04-07 13:39:37 -07:00