OSDN Git Service
Eino-Ville Talvala [Fri, 12 Jun 2015 22:47:38 +0000 (22:47 +0000)]
Merge "Camera3: Document behavior of flush() corner cases." into mnc-dev
Andy Hung [Fri, 12 Jun 2015 22:24:23 +0000 (22:24 +0000)]
Merge "Update USB channel mask handling" into mnc-dev
Andy Hung [Wed, 10 Jun 2015 22:17:00 +0000 (15:17 -0700)]
Update USB channel mask handling
1 and 2 channels will default to mono and stereo
n > 2 will default to channel index masks
Bug:
16245854
Change-Id: I39f9d43385a93f48e323653fbde2e38a99b6256f
Eino-Ville Talvala [Wed, 10 Jun 2015 21:58:32 +0000 (14:58 -0700)]
Camera3: Document behavior of flush() corner cases.
Document how HAL should operate when process_capture_request is
called while a flush() call is active.
Bug:
21506384
Change-Id: Ic1842add68123432e49914e83d8f7d5c13d6650d
Sasha Levitskiy [Mon, 8 Jun 2015 20:14:15 +0000 (13:14 -0700)]
Fingerprint: Avoid passing structures where simple types should suffice.
Bug:
21282699
Change-Id: I02e13b7da0ad361a95b981f9745aac039151f356
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Eino-Ville Talvala [Tue, 9 Jun 2015 22:24:26 +0000 (22:24 +0000)]
Merge "Camera2 tests: Update for framework changes" into mnc-dev
Eino-Ville Talvala [Tue, 9 Jun 2015 22:23:34 +0000 (15:23 -0700)]
Camera2 tests: Update for framework changes
Change-Id: I9ac788cfe9a001ef33bdc52a9e8ba0bdcf3ded2c
Casper Bonde [Fri, 8 May 2015 12:33:58 +0000 (14:33 +0200)]
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>
Sasha Levitskiy [Tue, 2 Jun 2015 18:29:12 +0000 (11:29 -0700)]
Fingerprint: Remove unused API elements.
Change-Id: Iba2f6a5bc7a2923c3e9b92684a2fab2190f14fd5
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Chien-Yu Chen [Wed, 3 Jun 2015 21:01:50 +0000 (21:01 +0000)]
Merge "Camera: Update for torch callbacks" into mnc-dev
Chien-Yu Chen [Wed, 3 Jun 2015 20:36:33 +0000 (13:36 -0700)]
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
Dan Stoza [Wed, 3 Jun 2015 17:42:38 +0000 (10:42 -0700)]
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
Shawn Willden [Wed, 3 Jun 2015 15:03:20 +0000 (09:03 -0600)]
Fix extern "C" guards.
Change-Id: Ibc8e023e3712903dbcbfac5fc64223e32775fe40
Shawn Willden [Wed, 3 Jun 2015 05:37:45 +0000 (05:37 +0000)]
Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev
Shawn Willden [Wed, 3 Jun 2015 05:30:17 +0000 (05:30 +0000)]
Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev
Shawn Willden [Wed, 3 Jun 2015 05:21:52 +0000 (05:21 +0000)]
Merge "Add output params to update() and finish()." into mnc-dev
Casper Bonde [Tue, 21 Apr 2015 11:15:50 +0000 (13:15 +0200)]
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>
Chong Zhang [Wed, 3 Jun 2015 02:23:30 +0000 (02:23 +0000)]
Merge "libhardware: fix gralloc usage bit redefine" into mnc-dev
Chong Zhang [Wed, 3 Jun 2015 02:00:11 +0000 (19:00 -0700)]
libhardware: fix gralloc usage bit redefine
bug:
21584171
Change-Id: I66c287681d3e53a263f85fbddfccbb199eaa4b33
Casper Bonde [Thu, 16 Apr 2015 13:25:41 +0000 (15:25 +0200)]
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>
Shawn Willden [Mon, 1 Jun 2015 17:40:34 +0000 (11:40 -0600)]
Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Bug:
19919114
Change-Id: I384f3d2fee2f68279c6518d9ac0a79e29bed0e52
destradaa [Mon, 1 Jun 2015 21:13:09 +0000 (21:13 +0000)]
Merge "Pack AGpsStatus data structures for 64-bit platforms. b/
21471818" into mnc-dev
destradaa [Mon, 1 Jun 2015 20:47:52 +0000 (13:47 -0700)]
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
Shawn Willden [Mon, 1 Jun 2015 17:40:24 +0000 (11:40 -0600)]
Fix block mode numbering (CTR got added as 4 rather than 3)
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
Shawn Willden [Mon, 1 Jun 2015 17:32:35 +0000 (11:32 -0600)]
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
Chien-Yu Chen [Mon, 1 Jun 2015 17:25:42 +0000 (17:25 +0000)]
Merge "Camera3: SHUTTER event for reprocessing" into mnc-dev
Chien-Yu Chen [Fri, 29 May 2015 00:13:05 +0000 (17:13 -0700)]
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
Dan Stoza [Fri, 29 May 2015 19:43:19 +0000 (12:43 -0700)]
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
Zhijun He [Fri, 29 May 2015 16:51:31 +0000 (16:51 +0000)]
Merge "camera3: add camera3 stream configuration mode" into mnc-dev
Jean-Michel Trivi [Fri, 29 May 2015 00:31:58 +0000 (00:31 +0000)]
Merge "Implement timestamp reporting functions" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 21:18:10 +0000 (14:18 -0700)]
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
Zhijun He [Sat, 23 May 2015 01:12:28 +0000 (18:12 -0700)]
camera3: add camera3 stream configuration mode
This will be used for creating high speed capture session.
Bug:
21442271
Change-Id: I51feaec83de3d402decca7e4da79be85844536b4
Jean-Michel Trivi [Wed, 27 May 2015 22:12:19 +0000 (22:12 +0000)]
Merge "Reduce pipe length" into mnc-dev
Jean-Michel Trivi [Tue, 26 May 2015 22:59:42 +0000 (15:59 -0700)]
Reduce pipe length
Bug
21198864
Change-Id: I5bb7ba20c4e2d294363a3a4487f4e3ae634ada46
Andres Morales [Thu, 21 May 2015 18:11:57 +0000 (11:11 -0700)]
add request re-enroll to HAL API
devices may want to request an upgrade to a newer pasword
handle version
Change-Id: I34c731c81406e29961cff1fcccdefad02cff1237
Sasha Levitskiy [Sat, 16 May 2015 17:46:58 +0000 (17:46 +0000)]
Merge "Fingerprint: Clean up documentaion for template delete." into mnc-dev
Sasha Levitskiy [Fri, 15 May 2015 22:46:47 +0000 (15:46 -0700)]
Fingerprint: Clean up documentaion for template delete.
Change-Id: Ibe991d5f5e4bb77a859284a8f890a6bccc663448
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Andres Morales [Fri, 15 May 2015 22:24:55 +0000 (22:24 +0000)]
Merge "[gatekeeper] document timeout requirements" into mnc-dev
Andres Morales [Thu, 14 May 2015 20:08:15 +0000 (13:08 -0700)]
[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
Sasha Levitskiy [Tue, 28 Apr 2015 22:49:05 +0000 (15:49 -0700)]
Fingerprint: Add enumerate function to FP HAL
Change-Id: I4a1da563a96a1e097ea56e0dced8c02820aa8485
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Andy Hung [Tue, 12 May 2015 19:30:13 +0000 (19:30 +0000)]
Merge "Remove unused data conversion functions from usb hal" into mnc-dev
Andy Hung [Tue, 12 May 2015 19:19:41 +0000 (19:19 +0000)]
Merge "Add output channel index mask to USB hal" into mnc-dev
Andy Hung [Tue, 12 May 2015 18:46:12 +0000 (18:46 +0000)]
Merge "Add multichannel input to USB hal" into mnc-dev
Andre Eisenbach [Fri, 5 Dec 2014 17:35:57 +0000 (09:35 -0800)]
Bluetooth native dumpsys logging support (1/5)
Bug:
18508263
Change-Id: Id7b69a6ed7d817a0f048cb8ebf0889c600171926
Shawn Willden [Mon, 11 May 2015 15:24:48 +0000 (09:24 -0600)]
Add KM_TAG_BOOTLOADER_ONLY.
Change-Id: Ia507a1378487640683985dbce2e76679261900d3
(cherry picked from commit
3eed99a54b55a120c835de63b5872121b2fe98d1)
Shawn Willden [Mon, 11 May 2015 13:06:01 +0000 (07:06 -0600)]
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
7f10ab99fc63e99252d924b9e0bdfefef5374b40)
Andy Hung [Fri, 8 May 2015 00:48:38 +0000 (17:48 -0700)]
Remove unused data conversion functions from usb hal
Change-Id: I4ccf8441171ad796e8954b1960f76411ebb86e9d
Andy Hung [Wed, 6 May 2015 06:37:30 +0000 (23:37 -0700)]
Add output channel index mask to USB hal
Change-Id: I17818ac89f7ca591422cadfaa388590ff9c08613
Andy Hung [Thu, 23 Apr 2015 05:14:39 +0000 (22:14 -0700)]
Add multichannel input to USB hal
Change-Id: I297669f7ba5a711923cf2f371d161819fad04740
Sasha Levitskiy [Thu, 7 May 2015 21:40:16 +0000 (14:40 -0700)]
Fingerprint: Add storage path to set_active_group()
Change-Id: Ic6e7ad21cd3a253a38a6291bf08517c7e441af2b
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Prerepa Viswanadham [Fri, 1 May 2015 17:57:25 +0000 (10:57 -0700)]
Merge commit '
5122502' into master_merge
Shawn Willden [Tue, 28 Apr 2015 06:00:27 +0000 (00:00 -0600)]
Add KM_ERROR_CALLER_NONCE_PROHIBITED error code.
Bug:
20127433
Change-Id: I32eab62459003c526d3cf9ef108be7b2fd709960
destradaa [Tue, 28 Apr 2015 22:52:04 +0000 (22:52 +0000)]
Merge "Update documentation related to A-GPS modes." into mnc-dev
destradaa [Tue, 28 Apr 2015 20:10:56 +0000 (13:10 -0700)]
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
Eric Laurent [Fri, 24 Apr 2015 02:11:36 +0000 (19:11 -0700)]
fm radio HAL: fix metadata handling
Fix potential crash due to list item removal
while processing metadata or cancel command.
Change-Id: I0c5552fcfc515e9591ce77f874c7450edb0dbf72
Ed Heyl [Sun, 26 Apr 2015 00:11:45 +0000 (00:11 +0000)]
am
067f3f78: am
35550a10: Merge changes from topic \'system-bt\'
* commit '
067f3f78d0ca6adea84a120aeaaca2e5e04fce5c':
L2CAP and SDP Search API for BT profiles (1/2)
Incorrect RSSI value in onlost/onfound
OnFound/OnLost feature API changes based on spec v0.90
Ed Heyl [Sat, 25 Apr 2015 23:49:56 +0000 (23:49 +0000)]
am
35550a10: Merge changes from topic \'system-bt\'
* commit '
35550a1030879bd3cb74f10f0cadb6e6f660bffb':
L2CAP and SDP Search API for BT profiles (1/2)
Incorrect RSSI value in onlost/onfound
OnFound/OnLost feature API changes based on spec v0.90
Ed Heyl [Sat, 25 Apr 2015 23:26:39 +0000 (23:26 +0000)]
Merge changes from topic 'system-bt'
* changes:
L2CAP and SDP Search API for BT profiles (1/2)
Incorrect RSSI value in onlost/onfound
OnFound/OnLost feature API changes based on spec v0.90
kschulz [Fri, 6 Mar 2015 08:15:43 +0000 (09:15 +0100)]
L2CAP and SDP Search API for BT profiles (1/2)
Added interface to create SDP records, to allow the upper
layers to set the content of the SDP record, including
both a RCFOMM channel and a l2cap PSM.
Change-Id: I7c47848a10b3d3091afbeadb4de8a8d7ea812288
Satya Calloji [Tue, 24 Mar 2015 01:18:13 +0000 (18:18 -0700)]
Incorrect RSSI value in onlost/onfound
Fix for signed value in onlost/onfound
Bug:
19891550
Change-Id: Idee4c566fe0d6f10a87c92f5bf03743fddbe2261
Satya Calloji [Tue, 10 Feb 2015 17:20:07 +0000 (09:20 -0800)]
OnFound/OnLost feature API changes based on spec v0.90
Bug:
19609671
Change-Id: Id28e188159aa41c940723fb5b12cade0a48e506b
Satya Calloji [Tue, 31 Mar 2015 20:58:21 +0000 (13:58 -0700)]
LE low power scan feature
LE low power extended scan feature header changes
based on Google spec v0.95
Bug:
20029342
Change-Id: Id1020a4da177d0bc421fdd123c5355a291cc0475
Sasha Levitskiy [Thu, 16 Apr 2015 21:45:04 +0000 (14:45 -0700)]
Fingerprint: Add an API to get authenticator id
Change-Id: If45ebc228425eaa43bf9abde934f8bb4e7d97e6c
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Tim Kilbourn [Mon, 6 Apr 2015 20:49:40 +0000 (13:49 -0700)]
Add input HAL methods for getting device properties.
A property map holds the collection of the properties for a given
device identifier. HAL modules allocate and release these property maps
to control the lifetime of the data. The host will typically open and
read the corresponding idc file on allocation, and release these
resources when it is freed.
Change-Id: Ia13ec7b7abf1a79eeed87dc744c174a37f1fb8a9
Eino-Ville Talvala [Thu, 16 Apr 2015 16:24:55 +0000 (16:24 +0000)]
Merge "Camera: Add HAL module init method."
Ashutosh Joshi [Thu, 16 Apr 2015 03:21:00 +0000 (03:21 +0000)]
Merge "Remove custome sensors from sensors.h"
Vinit Deshpande [Thu, 16 Apr 2015 03:12:43 +0000 (20:12 -0700)]
am
9a92a7b..
9a92a7b from mirror-m-wireless-internal-release
9a92a7b L2CAP and SDP Search API for BT profiles (1/2)
Eino-Ville Talvala [Tue, 7 Apr 2015 20:47:46 +0000 (13:47 -0700)]
Camera: Add HAL module init method.
For use by Camera HAL libraries to perform one-time initialization
steps after the library is loaded.
Bug:
20016050
Change-Id: Ia01ae0eafcadece9124ac2cfcc3b1c3939352843
Ashutosh Joshi [Wed, 15 Apr 2015 20:56:53 +0000 (13:56 -0700)]
Remove custome sensors from sensors.h
Custom sensors should not be included in sensors.h
Change-Id: I553fbe3dd41eaaa70628184f5a0b9499699f17bc
Dan Stoza [Wed, 15 Apr 2015 21:42:46 +0000 (21:42 +0000)]
am
7ff6445c: am
8fcb7ee2: Merge "HWC 1.5: Add per-layer damage region"
* commit '
7ff6445c7ae2c1f66dda17f5a5ee5ba53f23d796':
HWC 1.5: Add per-layer damage region
Dan Stoza [Wed, 15 Apr 2015 20:57:35 +0000 (20:57 +0000)]
am
8fcb7ee2: Merge "HWC 1.5: Add per-layer damage region"
* commit '
8fcb7ee243889b27eadfb0ce4142f40e7ce62e1f':
HWC 1.5: Add per-layer damage region
Dan Stoza [Wed, 15 Apr 2015 20:35:49 +0000 (20:35 +0000)]
Merge "HWC 1.5: Add per-layer damage region"
destradaa [Tue, 14 Apr 2015 23:56:39 +0000 (23:56 +0000)]
Merge "Complete updates to gps.h to enhance the definition of GPS Measurements interface. b/
19938206"
destradaa [Tue, 14 Apr 2015 23:30:21 +0000 (16:30 -0700)]
Complete updates to gps.h to enhance the definition of GPS Measurements interface.
b/
19938206
Change-Id: I9dc863e9333507d5603eee3951b0a2b7c8c2b299
Ashutosh Joshi [Tue, 14 Apr 2015 23:26:19 +0000 (23:26 +0000)]
Merge "Change struct offsets tests"
Ashutosh Joshi [Tue, 14 Apr 2015 23:06:02 +0000 (16:06 -0700)]
Change struct offsets tests
Change the structure offset tests to account for the addition
of a new member in a sensors device structure.
Change-Id: I2ef7b82446b09b32f903346bbc9b857a99d80043
Sasha Levitskiy [Tue, 14 Apr 2015 22:52:51 +0000 (22:52 +0000)]
Merge "Fingerprint: Add auth token to enroll"
Sasha Levitskiy [Mon, 13 Apr 2015 05:58:21 +0000 (22:58 -0700)]
Fingerprint: Add auth token to enroll
Change-Id: Ied10a03213b8473b1a625229a75b7af6126d635a
Ashutosh Joshi [Tue, 14 Apr 2015 22:15:16 +0000 (22:15 +0000)]
Merge "Sensors HAL changes"
Ashutosh Joshi [Fri, 3 Apr 2015 23:22:32 +0000 (16:22 -0700)]
Sensors HAL changes
Adding HAL changes for the following
i) a method to place the HAL in a special mode.
Expect to use this method for data-injection.
ii) a method to inject sensor data into the sensors subsystem.
iii) New sensor type for a SYNC event (google custom sensor).
iv) New sensor type for a nudge gesture (google custom sensor).
Change-Id: Idf0479b6301c5363cf51938e23aabc790b69fa96
destradaa [Fri, 10 Apr 2015 01:41:46 +0000 (18:41 -0700)]
Make updates gps.h to enhance the definition of GPS Measurements interface.
b/
19938206
The changes have been worked out after working with two partners to implement the interface.
The need of the additional flag is required, given that each partner can only provide one type of
pseudorange rate (corrected vs uncorrected).
Change-Id: I2d3bdffe5c24f8df97b33111a6753cc7b0f2b3d9
Shawn Willden [Tue, 14 Apr 2015 18:23:44 +0000 (18:23 +0000)]
am
6c93927d: am
4827279c: Merge "Add KM_ORIGIN_UNKNOWN."
* commit '
6c93927dd390abcf0e6254a38ef2c0f14fc1a51e':
Add KM_ORIGIN_UNKNOWN.
Shawn Willden [Tue, 14 Apr 2015 18:02:48 +0000 (18:02 +0000)]
am
4827279c: Merge "Add KM_ORIGIN_UNKNOWN."
* commit '
4827279cecbb5160788ac0cd923eb6b16f61b81e':
Add KM_ORIGIN_UNKNOWN.
Shawn Willden [Tue, 14 Apr 2015 17:42:59 +0000 (17:42 +0000)]
Merge "Add KM_ORIGIN_UNKNOWN."
David Christie [Mon, 13 Apr 2015 04:24:48 +0000 (21:24 -0700)]
Add ability to flush FLP HAL batched locations buffer.
Currently GmsCore has to guess how many locations to retrieve
based on requested frequency and then demux the output looking
for timestamps (that aren't monotonically increasing). This
capability gives GmsCore a more graceful solution.
Change-Id: If2d054c09efc98e33e357796bbfcd37c91b24ec8
David Christie [Mon, 13 Apr 2015 03:57:02 +0000 (20:57 -0700)]
Add a status callback for FLP HAL batching.
-Allows GmsCore to know if location batching is
unsuccessful so it can switch to a SW solution.
Change-Id: I5a01d44fdcf6daa07d6b40cf95a674e98179bf00
David Christie [Tue, 14 Apr 2015 00:03:20 +0000 (00:03 +0000)]
Merge "Add support for capability querying in the FLP HAL"
David Christie [Thu, 9 Apr 2015 21:53:37 +0000 (14:53 -0700)]
Add support for capability querying in the FLP HAL
Change-Id: I93ebdbdaf7dc0b2ddf1a7e7a089073db51cd15c3
Andres Morales [Mon, 13 Apr 2015 18:52:27 +0000 (18:52 +0000)]
am
9e4985e8: am
845ffcea: Merge "hw_auth_token: make timestamp 64 bits"
* commit '
9e4985e8cb40e6e53a01a1080c210c0c09be305f':
hw_auth_token: make timestamp 64 bits
Andres Morales [Mon, 13 Apr 2015 18:29:55 +0000 (18:29 +0000)]
am
845ffcea: Merge "hw_auth_token: make timestamp 64 bits"
* commit '
845ffceadc0d68ac806ebd6a1811bb43019aefb6':
hw_auth_token: make timestamp 64 bits
Shawn Willden [Mon, 13 Apr 2015 17:07:24 +0000 (11:07 -0600)]
Add KM_ORIGIN_UNKNOWN.
This designates keys whose origin cannot be determined because the
keymaster implementation is old and did not record it.
Change-Id: I3c366d527ed211c59f6dc04ddb48f3e9b3a07c7d
Andres Morales [Mon, 13 Apr 2015 17:58:13 +0000 (17:58 +0000)]
Merge "hw_auth_token: make timestamp 64 bits"
Andres Morales [Mon, 13 Apr 2015 17:21:32 +0000 (10:21 -0700)]
hw_auth_token: make timestamp 64 bits
Change-Id: I1f871300cd2edb407479e1e38284b068db364b38
Andres Morales [Sun, 12 Apr 2015 22:51:09 +0000 (22:51 +0000)]
Merge "add challenge to gatekeeper hal"
Prerepa Viswanadham [Sun, 12 Apr 2015 21:56:29 +0000 (21:56 +0000)]
Jim Miller [Thu, 9 Apr 2015 05:55:51 +0000 (22:55 -0700)]
Clean up FingerprintManager API and make it public.
Change-Id: I416dcc42fd70926875cc77e0c2cc958fdfcd9f9d
Andres Morales [Sat, 11 Apr 2015 02:51:11 +0000 (02:51 +0000)]
am
fb4a1850: am
8632c99f: Merge "Add HW_AUTH_TOKEN_VERSION constant"
* commit '
fb4a18508dc92dac91d747496562ecdc910ef4dd':
Add HW_AUTH_TOKEN_VERSION constant
Andres Morales [Sat, 11 Apr 2015 02:20:58 +0000 (02:20 +0000)]
am
8632c99f: Merge "Add HW_AUTH_TOKEN_VERSION constant"
* commit '
8632c99f9bace571fe7408fe6be5c5712e449ca8':
Add HW_AUTH_TOKEN_VERSION constant
Andres Morales [Sat, 11 Apr 2015 02:03:01 +0000 (02:03 +0000)]
Merge "Add HW_AUTH_TOKEN_VERSION constant"
Andres Morales [Wed, 8 Apr 2015 19:38:26 +0000 (12:38 -0700)]
Add HW_AUTH_TOKEN_VERSION constant
Change-Id: Ic01da2b9ed8efcdba7750d8ca7fe2321d9047b68