OSDN Git Service
Shawn Willden [Sat, 13 Jun 2015 01:55:40 +0000 (01:55 +0000)]
am
b138a64c: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG"
* commit '
b138a64cba78fad036b0f099668a2623c9ec5c18':
Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Shawn Willden [Sat, 13 Jun 2015 01:55:39 +0000 (01:55 +0000)]
am
c590cf31: Merge "Add output params to update() and finish()."
* commit '
c590cf313ce8d274bee2c49d09e62176a275e205':
Add output params to update() and finish().
Shawn Willden [Sat, 13 Jun 2015 01:55:39 +0000 (01:55 +0000)]
am
ed5a71fe: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)"
* commit '
ed5a71fe7ae2fe3e2ce78505e54d81786d35434b':
Fix block mode numbering (CTR got added as 4 rather than 3)
Eino-Ville Talvala [Fri, 12 Jun 2015 23:07:34 +0000 (23:07 +0000)]
am
8e350b1a: Merge "Camera3: Document behavior of flush() corner cases." into mnc-dev
* commit '
8e350b1a1d148ebf85e2c246e9f491fcdee51bdf':
Camera3: Document behavior of flush() corner cases.
Andy Hung [Fri, 12 Jun 2015 22:49:19 +0000 (22:49 +0000)]
am
8ae532dc: Merge "Update USB channel mask handling" into mnc-dev
* commit '
8ae532dc48caa4375997f30b70fc85b461f05bef':
Update USB channel mask handling
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
Shawn Willden [Fri, 12 Jun 2015 19:28:30 +0000 (19:28 +0000)]
Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG"
Shawn Willden [Fri, 12 Jun 2015 19:26:27 +0000 (19:26 +0000)]
Merge "Add output params to update() and finish()."
Shawn Willden [Fri, 12 Jun 2015 19:25:21 +0000 (19:25 +0000)]
Merge "Fix block mode numbering (CTR got added as 4 rather than 3)"
Dan Albert [Thu, 11 Jun 2015 20:05:53 +0000 (20:05 +0000)]
am
5e901ed4: Merge "Use abort() instead of a null dereference."
* commit '
5e901ed49faed3465c9df8e6cf6c684249bb3c8c':
Use abort() instead of a null dereference.
Dan Albert [Thu, 11 Jun 2015 19:41:42 +0000 (19:41 +0000)]
Merge "Use abort() instead of a null dereference."
Dan Albert [Thu, 11 Jun 2015 18:04:52 +0000 (11:04 -0700)]
Use abort() instead of a null dereference.
Clang deletes these because they're invalid. It's pretty awful of
clang to do this, but this should be abort() anyway.
Change-Id: I89423ff2c4d08db82077e56b726549e3783d38e1
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
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
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
Sasha Levitskiy [Wed, 10 Jun 2015 23:17:06 +0000 (23:17 +0000)]
am
d4331fda: Fingerprint: Avoid passing structures where simple types should suffice.
* commit '
d4331fdae5247bdbac27f1db94cac504ea5afb78':
Fingerprint: Avoid passing structures where simple types should suffice.
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
Andre Eisenbach [Wed, 10 Jun 2015 22:16:54 +0000 (22:16 +0000)]
am
5dc18299: Merge "LE low power scan feature"
* commit '
5dc18299df564fd2b8f35cead043dd1ae52e1397':
LE low power scan feature
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
Andre Eisenbach [Wed, 10 Jun 2015 21:12:37 +0000 (21:12 +0000)]
am
c9352622: Merge "Bluetooth native dumpsys logging support (1/5)"
* commit '
c93526225f351035c597d6278c2deb3ac32735a2':
Bluetooth native dumpsys logging support (1/5)
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>
Andre Eisenbach [Wed, 10 Jun 2015 20:46:58 +0000 (20:46 +0000)]
Merge "LE low power scan feature"
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
Andre Eisenbach [Wed, 10 Jun 2015 20:19:20 +0000 (20:19 +0000)]
Merge "Bluetooth native dumpsys logging support (1/5)"
Eino-Ville Talvala [Tue, 9 Jun 2015 22:55:09 +0000 (22:55 +0000)]
am
17b8cee9: Merge "Camera2 tests: Update for framework changes" into mnc-dev
* commit '
17b8cee9a2df698448381d1b03cec2b618c27e97':
Camera2 tests: Update for framework changes
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 [Tue, 9 Jun 2015 22:09:36 +0000 (22:09 +0000)]
am
5ccdc518: SAP: Make it possible to enforce a 16-digit pin code (2/5)
* commit '
5ccdc518ab33153625536ad31e7c9466511072ab':
SAP: Make it possible to enforce a 16-digit pin code (2/5)
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, 9 Jun 2015 13:01:18 +0000 (13:01 +0000)]
am
a70ab95e: Fingerprint: Remove unused API elements.
* commit '
a70ab95eeaf61594594a57e4de957dac47889c96':
Fingerprint: Remove unused API elements.
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>
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
Chien-Yu Chen [Wed, 3 Jun 2015 21:30:06 +0000 (21:30 +0000)]
am
c8812261: Merge "Camera: Update for torch callbacks" into mnc-dev
* commit '
c88122614c1593bc9384564b10f11bd7bb7e3b64':
Camera: Update for torch callbacks
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 19:14:54 +0000 (19:14 +0000)]
am
5e6082fd: Merge "gralloc: Sort usage flags"
* commit '
5e6082fd5611771ff9ff2911ed5cdca5d71f06b1':
gralloc: Sort usage flags
Dan Stoza [Wed, 3 Jun 2015 19:14:53 +0000 (19:14 +0000)]
am
f456512f: Merge "libhardware: fix gralloc usage bit redefine"
* commit '
f456512f9e54c534378683d0cd8f288b6312be2b':
libhardware: fix gralloc usage bit redefine
Dan Stoza [Wed, 3 Jun 2015 18:50:10 +0000 (18:50 +0000)]
am
fd2d8594: gralloc: Sort usage flags
* commit '
fd2d859445d614ab3f6c4687de839097566ac317':
gralloc: Sort usage flags
Shawn Willden [Wed, 3 Jun 2015 18:46:13 +0000 (18:46 +0000)]
am
7eaa15ff: Fix extern "C" guards.
* commit '
7eaa15ffa65239e8f4f23d21ff1a6ed66ed9a13f':
Fix extern "C" guards.
Dan Stoza [Wed, 3 Jun 2015 18:17:47 +0000 (18:17 +0000)]
Merge "gralloc: Sort usage flags"
Dan Stoza [Wed, 3 Jun 2015 18:17:16 +0000 (18:17 +0000)]
Merge "libhardware: fix gralloc usage bit redefine"
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
(cherry picked from commit
fd2d859445d614ab3f6c4687de839097566ac317)
Chong Zhang [Wed, 3 Jun 2015 02:00:11 +0000 (19:00 -0700)]
libhardware: fix gralloc usage bit redefine
bug:
21584171
Change-Id: I66c287681d3e53a263f85fbddfccbb199eaa4b33
(cherry picked from commit
2e3ed7e2e7fcdcf8c82b95b5156859ecc4d5b5d8)
Shawn Willden [Wed, 3 Jun 2015 17:45:52 +0000 (17:45 +0000)]
am
cbc5834c: Merge "Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG" into mnc-dev
* commit '
cbc5834cc742a66511a586e3001e57378ad361b0':
Remove KM_TAG_CHUNK_LENGTH and add KM_TAG_AEAD_TAG
Shawn Willden [Wed, 3 Jun 2015 17:45:36 +0000 (17:45 +0000)]
am
b248e712: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev
* commit '
b248e7125b6068105242fa26e59be0ac2abdcbef':
Fix block mode numbering (CTR got added as 4 rather than 3)
Shawn Willden [Wed, 3 Jun 2015 17:45:35 +0000 (17:45 +0000)]
am
f291adb5: Merge "Add output params to update() and finish()." into mnc-dev
* commit '
f291adb5935545af30c962253234ff5da557cfa8':
Add output params to update() and finish().
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 [Wed, 3 Jun 2015 04:03:55 +0000 (04:03 +0000)]
am
3e4c2dc1: Add support for MITM for BluetoothSockets (3/4)
* commit '
3e4c2dc18346158235066b54924db708accc63ce':
Add support for MITM for BluetoothSockets (3/4)
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:44:58 +0000 (02:44 +0000)]
am
cac8ab8a: Merge "libhardware: fix gralloc usage bit redefine" into mnc-dev
* commit '
cac8ab8abc8e4c3b75cc01efad69ff668ea81f22':
libhardware: fix gralloc usage bit redefine
Chong Zhang [Wed, 3 Jun 2015 02:23:30 +0000 (02:23 +0000)]
Merge "libhardware: fix gralloc usage bit redefine" into mnc-dev
Casper Bonde [Wed, 3 Jun 2015 02:22:13 +0000 (02:22 +0000)]
am
207331d0: SAP: Change to use new SDP Api (3/4)
* commit '
207331d05023ae8226219887c67a26582c1d7068':
SAP: Change to use new SDP Api (3/4)
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 23:22:42 +0000 (23:22 +0000)]
am
f19ee6b7: Merge "Pack AGpsStatus data structures for 64-bit platforms. b/
21471818" into mnc-dev
* commit '
f19ee6b70df52d535a3ef3321d0e9e2eca560ede':
Pack AGpsStatus data structures for 64-bit platforms. b/
21471818
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 18:51:06 +0000 (18:51 +0000)]
am
bbbcd516: Merge "Camera3: SHUTTER event for reprocessing" into mnc-dev
* commit '
bbbcd516a3b01c288c073ec4fc86ddd9a6115520':
Camera3: SHUTTER event for reprocessing
Dan Stoza [Mon, 1 Jun 2015 18:50:34 +0000 (18:50 +0000)]
am
201c7d91: gralloc: Add foreign buffer usage flag
* commit '
201c7d91b757f632bfd67ca24e6c55d0dc88a8d4':
gralloc: Add foreign buffer usage flag
Dan Stoza [Mon, 1 Jun 2015 18:43:58 +0000 (18:43 +0000)]
am
8a9ae4bd: Merge "gralloc: Add foreign buffer usage flag"
* commit '
8a9ae4bd71cf266626f9728d00672f0aa57df895':
gralloc: Add foreign buffer usage flag
Dan Stoza [Mon, 1 Jun 2015 18:21:11 +0000 (18:21 +0000)]
Merge "gralloc: Add foreign buffer usage flag"
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
(cherry picked from commit
201c7d91b757f632bfd67ca24e6c55d0dc88a8d4)
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
Zhijun He [Fri, 29 May 2015 20:51:35 +0000 (20:51 +0000)]
am
fa216fc2: Merge "camera3: add camera3 stream configuration mode" into mnc-dev
* commit '
fa216fc29d471da3264421024b7a485f05bfe634':
camera3: add camera3 stream configuration mode
Jean-Michel Trivi [Fri, 29 May 2015 20:51:34 +0000 (20:51 +0000)]
am
2a7adb1f: Merge "Implement timestamp reporting functions" into mnc-dev
* commit '
2a7adb1f7f88270f427c2968c286b9cd8b716bb2':
Implement timestamp reporting functions
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:43:56 +0000 (22:43 +0000)]
am
3358ea18: Merge "Reduce pipe length" into mnc-dev
* commit '
3358ea18bc697ce8d73a3bb09f53adf0e3919203':
Reduce pipe length
Jean-Michel Trivi [Wed, 27 May 2015 22:12:19 +0000 (22:12 +0000)]
Merge "Reduce pipe length" into mnc-dev
Andres Morales [Wed, 27 May 2015 20:46:27 +0000 (20:46 +0000)]
am
1cab2bf7: add request re-enroll to HAL API
* commit '
1cab2bf7e8046815c6ca887aafef185af22348e1':
add request re-enroll to HAL API
Jean-Michel Trivi [Tue, 26 May 2015 22:59:42 +0000 (15:59 -0700)]
Reduce pipe length
Bug
21198864
Change-Id: I5bb7ba20c4e2d294363a3a4487f4e3ae634ada46
Andres Morales [Wed, 27 May 2015 02:07:13 +0000 (02:07 +0000)]
am
d39ab59b: Merge "add request re-enroll to HAL API"
* commit '
d39ab59be020007394dfaeeb04d1280682fa1e5c':
add request re-enroll to HAL API
Andres Morales [Wed, 27 May 2015 01:37:10 +0000 (01:37 +0000)]
Merge "add request re-enroll to HAL API"
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
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
Andres Morales [Wed, 20 May 2015 01:47:02 +0000 (01:47 +0000)]
am
09bd94db: Merge "[gatekeeper] document timeout requirements"
* commit '
09bd94db8558e1228aad017861bc6beb9ba46472':
[gatekeeper] document timeout requirements
Andres Morales [Tue, 19 May 2015 18:27:44 +0000 (18:27 +0000)]
Merge "[gatekeeper] document timeout requirements"
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 [Sat, 16 May 2015 18:10:24 +0000 (18:10 +0000)]
am
c32baff9: Merge "Fingerprint: Clean up documentaion for template delete." into mnc-dev
* commit '
c32baff996726ba75c16f5bd4b49e9fd1e428548':
Fingerprint: Clean up documentaion for template delete.
Sasha Levitskiy [Sat, 16 May 2015 17:46:58 +0000 (17:46 +0000)]
Merge "Fingerprint: Clean up documentaion for template delete." into mnc-dev
Andres Morales [Fri, 15 May 2015 22:48:14 +0000 (22:48 +0000)]
am
d792aa6a: Merge "[gatekeeper] document timeout requirements" into mnc-dev
* commit '
d792aa6a88cfa2dd10d8859d07f33921e15b961b':
[gatekeeper] document timeout requirements
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
Shawn Willden [Wed, 13 May 2015 15:21:38 +0000 (15:21 +0000)]
am
ee50eb66: Merge "Add KM_TAG_BOOTLOADER_ONLY."
* commit '
ee50eb66036598cb2ace01a7c2ba1f5c8d1b7167':
Add KM_TAG_BOOTLOADER_ONLY.
Shawn Willden [Wed, 13 May 2015 15:21:36 +0000 (15:21 +0000)]
am
44de9bad: (-s ours) Merge "Remove rescoping."
* commit '
44de9badfa4a39d3de1ff17ddcac7ce401635e39':
Remove rescoping.
Sasha Levitskiy [Wed, 13 May 2015 00:08:01 +0000 (00:08 +0000)]
am
e0a2988b: Fingerprint: Add enumerate function to FP HAL
* commit '
e0a2988b82afd9141eba075a231dfa47c55c01c4':
Fingerprint: Add enumerate function to FP HAL
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>