Commit graph

2352 commits

Author SHA1 Message Date
Eino-Ville Talvala
17b8cee9a2 Merge "Camera2 tests: Update for framework changes" into mnc-dev 2015-06-09 22:24:27 +00:00
Eino-Ville Talvala
cd6984e762 Camera2 tests: Update for framework changes
Change-Id: I9ac788cfe9a001ef33bdc52a9e8ba0bdcf3ded2c
2015-06-09 15:23:34 -07:00
Casper Bonde
5ccdc518ab SAP: Make it possible to enforce a 16-digit pin code (2/5)
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.

This is needed for the SIM access profile.

Change-Id: I4d43eefa76e8abc1bcfad6dfd9004d8e82168bf4
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-09 13:57:53 -07:00
Sasha Levitskiy
a70ab95eea Fingerprint: Remove unused API elements.
Change-Id: Iba2f6a5bc7a2923c3e9b92684a2fab2190f14fd5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-06-08 14:00:39 -07:00
Chien-Yu Chen
c88122614c Merge "Camera: Update for torch callbacks" into mnc-dev 2015-06-03 21:02:00 +00:00
Chien-Yu Chen
5c6230ebf6 Camera: Update for torch callbacks
Clarify that HAL shouldn't send AVAILABLE_OFF in addition to
NOT_AVAILABLE when open() is called.

Update the comments to use the right torch status enums.

Bug: 21475390
Change-Id: If9adf4bd169048fc9760ef504d3a36414cfbb196
2015-06-03 13:59:39 -07:00
Dan Stoza
fd2d859445 gralloc: Sort usage flags
Sorts the usage flags in increasing order so it's easier to see where
the gaps are.

Bug: 21609491
Change-Id: I98af3c67be84c6c5137767f3cd7a8bd63dfb5c03
2015-06-03 10:42:38 -07:00
Shawn Willden
7eaa15ffa6 Fix extern "C" guards.
Change-Id: Ibc8e023e3712903dbcbfac5fc64223e32775fe40
2015-06-03 09:03:20 -06:00
Shawn Willden
cbc5834cc7 Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev 2015-06-03 05:37:48 +00:00
Shawn Willden
b248e7125b Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev 2015-06-03 05:30:18 +00:00
Shawn Willden
f291adb593 Merge "Add output params to update() and finish()." into mnc-dev 2015-06-03 05:21:57 +00:00
Casper Bonde
3e4c2dc183 Add support for MITM for BluetoothSockets (3/4)
This change adds an option to enforce Man-in-the-middle protection
for the authentication process. This feature is needed for the Sim
Access Profile.

Change-Id: I35d22a516ecbfc011ed13d7cb7d2ebda047fdfad
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-03 03:44:17 +00:00
Chong Zhang
cac8ab8abc Merge "libhardware: fix gralloc usage bit redefine" into mnc-dev 2015-06-03 02:23:31 +00:00
Chong Zhang
2e3ed7e2e7 libhardware: fix gralloc usage bit redefine
bug: 21584171
Change-Id: I66c287681d3e53a263f85fbddfccbb199eaa4b33
2015-06-02 19:00:11 -07:00
Casper Bonde
207331d050 SAP: Change to use new SDP Api (3/4)
Added struct to carry SAP SDP record data.

Change-Id: I511a8de39a6d750e3e94bee72f48b3356ce6cd02
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
2015-06-02 17:00:50 -07:00
Shawn Willden
4144c64818 Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Bug: 19919114
Change-Id: I384f3d2fee2f68279c6518d9ac0a79e29bed0e52
2015-06-02 09:01:30 -06:00
destradaa
f19ee6b70d Merge "Pack AGpsStatus data structures for 64-bit platforms. b/21471818" into mnc-dev 2015-06-01 21:13:10 +00:00
destradaa
6f8f5c5f40 Pack AGpsStatus data structures for 64-bit platforms.
b/21471818

The packing of AGpsStatus_v1 ensures that its size does not collide with
the size of AGpsStatus_v2.

Change-Id: Ic73a73070c29c0e819cb62667bc14333f448e856
2015-06-01 14:05:51 -07:00
Shawn Willden
4c19a3af35 Fix block mode numbering (CTR got added as 4 rather than 3)
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
2015-06-01 14:52:54 -06:00
Shawn Willden
024a15265c Add output params to update() and finish().
Also, change signatures of several methods to pass structs rather than
array pointers and lengths.

Change-Id: Iaa1be186ebbd444202c47926ab57ac65d57416d7
2015-06-01 14:52:54 -06:00
Chien-Yu Chen
bbbcd516a3 Merge "Camera3: SHUTTER event for reprocessing" into mnc-dev 2015-06-01 17:25:43 +00:00
Chien-Yu Chen
73b49ebbf4 Camera3: SHUTTER event for reprocessing
Clarify that the SHUTTER event should be sent when HAL
start processing a reprocess request but the timestamp
should be the input image's start of exposure.

Bug: 21112186
Change-Id: I5bd32b749adc5e82e9a311ec4b123fd807a30d36
2015-06-01 10:21:16 -07:00
Dan Stoza
201c7d91b7 gralloc: Add foreign buffer usage flag
Adds GRALLOC_USAGE_FOREIGN_BUFFERS, which a consumer may set as a usage
flag if it intends to attach buffers that it has not detached from the
BufferQueue. It provides a hint to the producer (who may query the
consumer usage bits) that it may receive a buffer from another
BufferQueue, so that it can exit during initialization, hopefully with a
meaningful error message, if such buffers are not supported.

Also adds GRALLOC_USAGE_ALLOC_MASK, which is applied to usage bits
before calling alloc on the gralloc module, and prevents the module from
seeing GRALLOC_USAGE_FOREIGN_BUFFERS, since that usage flag is of no use
while allocating buffers.

Bug: 19801661
Change-Id: I17b927de94245f4df7cfd3f4483b544da3e9cd35
2015-05-29 19:52:34 +00:00
Zhijun He
fa216fc29d Merge "camera3: add camera3 stream configuration mode" into mnc-dev 2015-05-29 16:51:32 +00:00
Jean-Michel Trivi
2a7adb1f7f Merge "Implement timestamp reporting functions" into mnc-dev 2015-05-29 00:31:58 +00:00
Jean-Michel Trivi
25f4751f6d Implement timestamp reporting functions
Count number of frames that have been written, reset on standby.
The presentation position is the number of written frames minus
  the frames still in the pipe (they were written but not presented).

Bug 21198864

Change-Id: I00ef10f56a825555e7a970cce1504a9bd3744e04
2015-05-28 16:19:36 -07:00
Zhijun He
21126b78e3 camera3: add camera3 stream configuration mode
This will be used for creating high speed capture session.

Bug: 21442271
Change-Id: I51feaec83de3d402decca7e4da79be85844536b4
2015-05-28 15:24:56 -07:00
Jean-Michel Trivi
3358ea18bc Merge "Reduce pipe length" into mnc-dev 2015-05-27 22:12:20 +00:00
Jean-Michel Trivi
bbb3e77ab0 Reduce pipe length
Bug 21198864

Change-Id: I5bb7ba20c4e2d294363a3a4487f4e3ae634ada46
2015-05-27 09:40:56 -07:00
Andres Morales
1cab2bf7e8 add request re-enroll to HAL API
devices may want to request an upgrade to a newer pasword
handle version

Change-Id: I34c731c81406e29961cff1fcccdefad02cff1237
2015-05-21 11:11:57 -07:00
Sasha Levitskiy
c32baff996 Merge "Fingerprint: Clean up documentaion for template delete." into mnc-dev 2015-05-16 17:47:00 +00:00
Sasha Levitskiy
0a544125ca Fingerprint: Clean up documentaion for template delete.
Change-Id: Ibe991d5f5e4bb77a859284a8f890a6bccc663448
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-05-15 15:46:47 -07:00
Andres Morales
d792aa6a88 Merge "[gatekeeper] document timeout requirements" into mnc-dev 2015-05-15 22:24:56 +00:00
Andres Morales
cca930dd7c [gatekeeper] document timeout requirements
GateKeeper may throttle the user, document the return
value of calls in this case.

No code changes.

Bug:21118563
Change-Id: Idd6c392d01c22627f828d86dd219a4a1d6e81439
2015-05-14 13:08:15 -07:00
Sasha Levitskiy
e0a2988b82 Fingerprint: Add enumerate function to FP HAL
Change-Id: I4a1da563a96a1e097ea56e0dced8c02820aa8485
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-05-12 16:35:15 -07:00
Andy Hung
9e82a9dd5e Merge "Remove unused data conversion functions from usb hal" into mnc-dev 2015-05-12 19:30:14 +00:00
Andy Hung
b5635a6fd7 Merge "Add output channel index mask to USB hal" into mnc-dev 2015-05-12 19:19:42 +00:00
Andy Hung
03d61b05e0 Merge "Add multichannel input to USB hal" into mnc-dev 2015-05-12 18:46:12 +00:00
Andre Eisenbach
34ab95a369 Bluetooth native dumpsys logging support (1/5)
Bug: 18508263
Change-Id: Id7b69a6ed7d817a0f048cb8ebf0889c600171926
2015-05-12 15:56:10 +00:00
Shawn Willden
fb769fc312 Add KM_TAG_BOOTLOADER_ONLY.
Change-Id: Ia507a1378487640683985dbce2e76679261900d3
(cherry picked from commit 3eed99a54b)
2015-05-12 12:09:56 +00:00
Shawn Willden
9b31a49c36 Remove rescoping.
Rescoping was never a very good solution to the problem of supporting
multiple sets of authorizations for a given key material.  For M we're
removing it and in the future a better solution will be provided.

Change-Id: I6f7585274487bd66e4d90e89014af41e9aa30411
(cherry picked from commit 7f10ab99fc)
2015-05-12 11:29:27 +00:00
Andy Hung
f90f8f8ada Remove unused data conversion functions from usb hal
Change-Id: I4ccf8441171ad796e8954b1960f76411ebb86e9d
2015-05-11 12:19:37 -07:00
Andy Hung
182ddc7d13 Add output channel index mask to USB hal
Change-Id: I17818ac89f7ca591422cadfaa388590ff9c08613
2015-05-11 12:18:04 -07:00
Andy Hung
780f1f8149 Add multichannel input to USB hal
Change-Id: I297669f7ba5a711923cf2f371d161819fad04740
2015-05-11 12:13:25 -07:00
Sasha Levitskiy
7eb7235c33 Fingerprint: Add storage path to set_active_group()
Change-Id: Ic6e7ad21cd3a253a38a6291bf08517c7e441af2b
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2015-05-07 19:25:00 -07:00
Prerepa Viswanadham
f0254aa0a0 Merge commit '5122502' into master_merge 2015-05-01 10:57:25 -07:00
Shawn Willden
4bdd7cbd47 Add KM_ERROR_CALLER_NONCE_PROHIBITED error code.
Bug: 20127433
Change-Id: I32eab62459003c526d3cf9ef108be7b2fd709960
2015-04-29 22:33:35 -06:00
destradaa
f68e4fe37b Merge "Update documentation related to A-GPS modes." into mnc-dev 2015-04-28 22:52:05 +00:00
destradaa
8153488b70 Update documentation related to A-GPS modes.
MS-Assisted has only be supported for legacy reasons for a while now.
This change moves gps.h in a direction where MS-Based (on device
computation with AGPS/Supl support) is the preferred mode to compute
locations in the device.

Change-Id: Id34a84bae79be52a435b78d249fb5b86a5f6b090
2015-04-28 13:10:56 -07:00
Eric Laurent
acccf647af fm radio HAL: fix metadata handling
Fix potential crash due to list item removal
while processing metadata or cancel command.

Change-Id: I0c5552fcfc515e9591ce77f874c7450edb0dbf72
2015-04-27 23:05:08 +00:00