OSDN Git Service
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
Shawn Willden [Fri, 10 Apr 2015 21:58:50 +0000 (21:58 +0000)]
am
5d6b0b41: am
e7444884: Merge "Make several key crypto parameters repeatable."
* commit '
5d6b0b41808e69c644cbc85d90a5842d5563e3dc':
Make several key crypto parameters repeatable.
Shawn Willden [Fri, 10 Apr 2015 21:38:39 +0000 (21:38 +0000)]
am
e7444884: Merge "Make several key crypto parameters repeatable."
* commit '
e7444884c759b066c65e0be32a7e753c0c667709':
Make several key crypto parameters repeatable.
Shawn Willden [Fri, 10 Apr 2015 21:21:25 +0000 (21:21 +0000)]
Merge "Make several key crypto parameters repeatable."
Shawn Willden [Fri, 10 Apr 2015 20:53:27 +0000 (20:53 +0000)]
am
b9554eed: am
614e69d4: Merge "Correct return type of delete_all_keys."
* commit '
b9554eedc782391eb5304c03a0bf8f01b0280499':
Correct return type of delete_all_keys.
Shawn Willden [Fri, 10 Apr 2015 20:32:47 +0000 (20:32 +0000)]
am
614e69d4: Merge "Correct return type of delete_all_keys."
* commit '
614e69d4a212c1e9bddecb2cb2183d20117a8650':
Correct return type of delete_all_keys.
Shawn Willden [Fri, 10 Apr 2015 20:12:45 +0000 (20:12 +0000)]
Merge "Correct return type of delete_all_keys."
Prerepa Viswanadham [Fri, 10 Apr 2015 18:58:29 +0000 (11:58 -0700)]
Shawn Willden [Thu, 26 Feb 2015 00:33:40 +0000 (17:33 -0700)]
Make several key crypto parameters repeatable.
Note that there's a pre-requisite to landing this CL: The Nexus 9
keystore.flounder.so must be modified to translate between new and old
tag numbers when the TEE side is version 0.
Bug:
19509156
Change-Id: Ic584d8a6bf5601f9754563b67b3cc6b3ca6b5ff9
Shawn Willden [Fri, 10 Apr 2015 14:19:38 +0000 (14:19 +0000)]
am
94269ea0: am
6950fae4: Merge "Simplify keymaster_key_origin_t."
* commit '
94269ea08086df37d4a358a802c292742cb75850':
Simplify keymaster_key_origin_t.
Shawn Willden [Fri, 10 Apr 2015 14:00:20 +0000 (14:00 +0000)]
am
6950fae4: Merge "Simplify keymaster_key_origin_t."
* commit '
6950fae4646752f79f42d6a7335f58c33ce4c20d':
Simplify keymaster_key_origin_t.
Shawn Willden [Wed, 8 Apr 2015 12:54:57 +0000 (06:54 -0600)]
Correct return type of delete_all_keys.
Change-Id: Ic868882a4b456913879f91562442ef233a58d09e
Shawn Willden [Fri, 10 Apr 2015 13:46:36 +0000 (13:46 +0000)]
Merge "Simplify keymaster_key_origin_t."
Shawn Willden [Tue, 7 Apr 2015 19:56:30 +0000 (13:56 -0600)]
Simplify keymaster_key_origin_t.
Change-Id: Iaba6156f238ea3bb1ad103b88ccea17344d296af
Shawn Willden [Fri, 10 Apr 2015 04:35:15 +0000 (04:35 +0000)]
am
cc521ead: am
3f3b9790: Merge "Reduce the list of keymaster key formats to the required set."
* commit '
cc521eada2f2926791eb42a369a1e2151fe18a33':
Reduce the list of keymaster key formats to the required set.
Shawn Willden [Fri, 10 Apr 2015 04:35:14 +0000 (04:35 +0000)]
am
b0759b61: am
def4b59e: Merge "Reduce the list of keymaster padding modes to the required set."
* commit '
b0759b61f8714fb2ff3aa6f89f60e55a3d878ec5':
Reduce the list of keymaster padding modes to the required set.
Shawn Willden [Fri, 10 Apr 2015 04:35:13 +0000 (04:35 +0000)]
am
4821c01e: am
fc691d91: Merge "Reduce keymaster digest list to required set."
* commit '
4821c01e1c6bcb117cea0b59d976b23bf3664972':
Reduce keymaster digest list to required set.
Shawn Willden [Fri, 10 Apr 2015 04:35:12 +0000 (04:35 +0000)]
am
7b12e556: am
5e58787b: Merge "Reduce keymaster block modes to the required set."
* commit '
7b12e5560c423ff02164a5cb8b5bbefd5a123e84':
Reduce keymaster block modes to the required set.
Shawn Willden [Fri, 10 Apr 2015 04:33:50 +0000 (04:33 +0000)]
am
bc036083: am
1d9de3e6: Merge "Reduce keymaster algorithm list to the required set."
* commit '
bc0360838fdf7945f99bc600813e5342f53c9790':
Reduce keymaster algorithm list to the required set.
Shawn Willden [Fri, 10 Apr 2015 04:33:40 +0000 (04:33 +0000)]
am
2d19dbfe: am
5d8d3981: Merge "Start authenticator numbering from 1, instead of 2."
* commit '
2d19dbfed66adff49d58231483a887c6dd63a7b8':
Start authenticator numbering from 1, instead of 2.
Shawn Willden [Fri, 10 Apr 2015 02:43:26 +0000 (02:43 +0000)]
am
3f3b9790: Merge "Reduce the list of keymaster key formats to the required set."
* commit '
3f3b9790739a287223cfd63bc72e6b19635dced5':
Reduce the list of keymaster key formats to the required set.
Shawn Willden [Fri, 10 Apr 2015 02:43:25 +0000 (02:43 +0000)]
am
def4b59e: Merge "Reduce the list of keymaster padding modes to the required set."
* commit '
def4b59e69942bc22cda10448c8e8ee2417a186a':
Reduce the list of keymaster padding modes to the required set.
Shawn Willden [Fri, 10 Apr 2015 02:43:24 +0000 (02:43 +0000)]
am
fc691d91: Merge "Reduce keymaster digest list to required set."
* commit '
fc691d91491ee058844d8c72b45acb572a819787':
Reduce keymaster digest list to required set.
Shawn Willden [Fri, 10 Apr 2015 02:43:23 +0000 (02:43 +0000)]
am
5e58787b: Merge "Reduce keymaster block modes to the required set."
* commit '
5e58787ba05538a75207c2bb6a26528c96535626':
Reduce keymaster block modes to the required set.
Shawn Willden [Fri, 10 Apr 2015 02:24:14 +0000 (02:24 +0000)]
Merge "Reduce the list of keymaster key formats to the required set."
Shawn Willden [Fri, 10 Apr 2015 02:23:58 +0000 (02:23 +0000)]
Merge "Reduce the list of keymaster padding modes to the required set."
Shawn Willden [Fri, 10 Apr 2015 02:23:37 +0000 (02:23 +0000)]
Merge "Reduce keymaster digest list to required set."
Shawn Willden [Fri, 10 Apr 2015 02:23:18 +0000 (02:23 +0000)]
Merge "Reduce keymaster block modes to the required set."
Andres Morales [Fri, 10 Apr 2015 02:17:40 +0000 (19:17 -0700)]
add challenge to gatekeeper hal
Change-Id: Iffd250233c9ec2a28682f018984e28531bd83e7a
Shawn Willden [Fri, 10 Apr 2015 00:06:36 +0000 (00:06 +0000)]
am
1d9de3e6: Merge "Reduce keymaster algorithm list to the required set."
* commit '
1d9de3e6eb1fbc2f6704e2c415439cb7869ec47b':
Reduce keymaster algorithm list to the required set.
Shawn Willden [Thu, 9 Apr 2015 23:49:02 +0000 (23:49 +0000)]
Merge "Reduce keymaster algorithm list to the required set."
Shawn Willden [Thu, 9 Apr 2015 23:43:37 +0000 (23:43 +0000)]
am
5d8d3981: Merge "Start authenticator numbering from 1, instead of 2."
* commit '
5d8d398186c87f91de9d1a3384c2a5fdde05fd6a':
Start authenticator numbering from 1, instead of 2.
Shawn Willden [Thu, 9 Apr 2015 23:21:23 +0000 (23:21 +0000)]
Merge "Start authenticator numbering from 1, instead of 2."
Andres Morales [Thu, 9 Apr 2015 21:17:21 +0000 (21:17 +0000)]
Merge "fix extern C decl"
Andres Morales [Thu, 9 Apr 2015 18:46:52 +0000 (11:46 -0700)]
fix extern C decl
extern C should be declared for C++ files, not C files
Change-Id: I3e30af2e45774b50259b9575cf699d7c0b455cad
Shawn Willden [Tue, 7 Apr 2015 19:48:27 +0000 (13:48 -0600)]
Reduce the list of keymaster key formats to the required set.
Change-Id: I3a0830ab2066d4c16c084d19040ec98e520896d4
Shawn Willden [Tue, 7 Apr 2015 19:41:30 +0000 (13:41 -0600)]
Reduce the list of keymaster padding modes to the required set.
Change-Id: If04ffc8e92678f57e2b730f77c0fab195e1096c4
Shawn Willden [Tue, 7 Apr 2015 20:02:28 +0000 (14:02 -0600)]
Reduce keymaster digest list to required set.
Change-Id: Id5c660feb7e71ea76473523e3a86e1ba01f19c82
Shawn Willden [Tue, 7 Apr 2015 19:40:00 +0000 (13:40 -0600)]
Reduce keymaster block modes to the required set.
Change-Id: I8f804978208e2c8701bd52dc79b5597a307b7e7a
Shawn Willden [Tue, 7 Apr 2015 19:39:12 +0000 (13:39 -0600)]
Reduce keymaster algorithm list to the required set.
Change-Id: Ibffddc5c3a5c728182f5ca7f6a76381413fc8645
Andres Morales [Thu, 9 Apr 2015 15:52:45 +0000 (15:52 +0000)]
Merge "Add HW_AUTH_TOKEN_VERSION constant"
David Christie [Wed, 8 Apr 2015 22:30:55 +0000 (15:30 -0700)]
Add smallest displacement feature to FLP HAL
Change-Id: I73d5391be3640d5f5c9a1cbee3ed36beec9c1df0
Andres Morales [Wed, 8 Apr 2015 19:38:26 +0000 (12:38 -0700)]
Add HW_AUTH_TOKEN_VERSION constant
Change-Id: Ic01da2b9ed8efcdba7750d8ca7fe2321d9047b68
Shawn Willden [Mon, 6 Apr 2015 17:50:04 +0000 (11:50 -0600)]
Start authenticator numbering from 1, instead of 2.
Change-Id: I44d94fd597ae7dec5199388b9ab0bd952cf831c3
Andres Morales [Mon, 6 Apr 2015 16:18:49 +0000 (16:18 +0000)]
Merge "Replace size_t with uint32_t"
Etan Cohen [Thu, 2 Apr 2015 03:07:28 +0000 (03:07 +0000)]
Andres Morales [Mon, 30 Mar 2015 23:51:50 +0000 (16:51 -0700)]
Replace size_t with uint32_t
Prefer fixed width fields
Change-Id: If4b5b329a6ae008fd4ace4ddecdf2a680c3881c6
Etan Cohen [Tue, 31 Mar 2015 16:23:24 +0000 (09:23 -0700)]
Tim Kilbourn [Fri, 27 Feb 2015 23:01:50 +0000 (15:01 -0800)]
More usage support in the Input HAL.
Define keycode, axis, and led usages.
Add callback interfaces for setting usage values in a report.
Change-Id: I5c7effddb7fce85d7d33ea79ff7005d37943f520
Tim Kilbourn [Fri, 13 Feb 2015 18:35:20 +0000 (10:35 -0800)]
Input event hub for evdev input HAL module.
InputHub monitors paths for device changes and input events.
InputDeviceManager creates InputDevices and routes input events to
them. InputDevices currently just log these events during development.
InputHost represents a wrapper around the HAL interface.
Change-Id: Ic47d574498eb07bcdcd17812a648539fdf1c69d6
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
Jim Miller [Wed, 25 Mar 2015 19:45:16 +0000 (19:45 +0000)]
Merge "Update fingerprint.h for new API"
Jim Miller [Wed, 25 Mar 2015 02:25:47 +0000 (19:25 -0700)]
Update fingerprint.h for new API
This adds vendor-specific messaging capabilities to the
HAL driver to avoid the possibility of vendors clobbering
general-purpose methods. The framework translates these
additional messages as an offset into a custom message array.
Additionally, authenticate() now takes a group id to restrict
authentication to a subset of possible fingerprints.
Bug
16487912
Change-Id: I8a92a6c86b4729af03a5576b4a150b1c73fbc9cc
Yin-Chia Yeh [Tue, 24 Mar 2015 22:41:14 +0000 (22:41 +0000)]
Merge "Camera: update test per interface change"
Yin-Chia Yeh [Tue, 24 Mar 2015 17:48:08 +0000 (10:48 -0700)]
Camera: update test per interface change
CameraModule does not allow for accessing raw module pointer
anymore. Also cleanup some warnings.
Bug:
19897963
Change-Id: I111cc093f09f5fb3c4b13693d5d0687e1f441058
Yin-Chia Yeh [Thu, 12 Mar 2015 22:09:27 +0000 (15:09 -0700)]
Camera: Fix tests per camera service interface change
Also clarify rotation field has no meaning and will always be 0
for a input stream.
Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
Yin-Chia Yeh [Mon, 9 Mar 2015 19:15:36 +0000 (12:15 -0700)]
Camera3: Add rotation field to camera3_stream_t
This allows application or framework request HAL to perform a
rotation of 0, 90, 180 or 270 degrees counterclockwise. Currently
there is no plan to support arbitrary rotation angles.
HAL should return -EINVAL if the requested rotation cannot be
supported.
Change-Id: I8bde2bcfd797c408db4d5b391b170a4e856ec2d0
Eino-Ville Talvala [Fri, 6 Mar 2015 21:23:18 +0000 (13:23 -0800)]
Camera tests: Adjust for framework device interface changes
Account for requirement to pass in dataspace in stream creation.
Change-Id: Ibc5af912ef4a55b787c70843fc82422977a02c0b
Eino-Ville Talvala [Fri, 6 Mar 2015 21:22:03 +0000 (13:22 -0800)]
Camera3: Add dataspace to camera HAL device stream configuration
The dataspace field communicates extra context about the requested
stream configuration. For most graphics formats, the dataspace
indicates the desired colorspace out of the output buffers. For some
formats, the dataspace may indicate that depth output is requested
instead.
Change-Id: I6746d9097b4dc36af0a63ca88df75f32a77db90b
Ruben Brunk [Tue, 10 Mar 2015 18:53:12 +0000 (11:53 -0700)]
camera2: Update HAL docs on eviction behavior.
Bug:
19186859
Change-Id: Ie051f966a758c68d354250c245a87df57a4f4ae3
Shawn Willden [Mon, 23 Mar 2015 23:24:20 +0000 (23:24 +0000)]
am
92469ed0: am
f1babb18: Merge "Add KM_TAG_USER_SECURE_ID."
* commit '
92469ed087f6e3c0b13ad0562661236731358029':
Add KM_TAG_USER_SECURE_ID.
Glenn Kasten [Mon, 23 Mar 2015 17:52:31 +0000 (10:52 -0700)]
Fix build error on 64-bit
Change-Id: I9a308bf6499a74efa8084a2e4df1f029b26f3d6c
Ricardo Garcia [Mon, 23 Mar 2015 17:21:15 +0000 (17:21 +0000)]
Merge "Creating audio.stub.default for default HAL audio output"
Shawn Willden [Sat, 21 Mar 2015 17:11:23 +0000 (17:11 +0000)]
am
f1babb18: Merge "Add KM_TAG_USER_SECURE_ID."
* commit '
f1babb18ae11e4870ae58ccdd339e5b643b1f69e':
Add KM_TAG_USER_SECURE_ID.
Shawn Willden [Sat, 21 Mar 2015 03:13:33 +0000 (03:13 +0000)]
Merge "Add KM_TAG_USER_SECURE_ID."
Andres Morales [Fri, 20 Mar 2015 01:58:58 +0000 (18:58 -0700)]
Rename keyguard to gatekeeper
Avoids confusion with the other part of the system
known as Keyguard.
Change-Id: Ie32a3a4c990c4317cfd462a0e6dbf8fc490d4de2
Andres Morales [Fri, 20 Mar 2015 01:56:11 +0000 (01:56 +0000)]
Merge "Update keyguard API"
Yin-Chia Yeh [Thu, 19 Mar 2015 17:27:27 +0000 (17:27 +0000)]
Merge "Camera: Fix tests per camera service interface change"
Andres Morales [Thu, 19 Mar 2015 15:40:41 +0000 (08:40 -0700)]
Update keyguard API
Change-Id: I51f144134e58109ed6e9747926645bd956631ad4
Shawn Willden [Thu, 19 Mar 2015 01:47:42 +0000 (01:47 +0000)]
am
4dfbc5e3: am
6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS."
* commit '
4dfbc5e320eaf0bfdc0af242ac16153143d4ba4c':
Use extern "C" rather than BEGIN/END_DECLS.
Shawn Willden [Thu, 19 Mar 2015 01:38:53 +0000 (01:38 +0000)]
am
6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS."
* commit '
6a39dafe872d4e1b3da8df4c4e5e79b66109e3d9':
Use extern "C" rather than BEGIN/END_DECLS.
Shawn Willden [Thu, 19 Mar 2015 01:26:27 +0000 (01:26 +0000)]
Merge "Use extern "C" rather than BEGIN/END_DECLS."
Shawn Willden [Sat, 14 Mar 2015 13:54:52 +0000 (07:54 -0600)]
Add KM_TAG_USER_SECURE_ID.
This tag identifies the user authorized to use the key. Unlike
KM_TAG_USER_ID, its value does not reference the Linux-side user ID, but
a secure-world user ID, generated and managed by secure-world
authentication apps.
Bug:
19511945
Change-Id: I629ab2c47ee6d42de20a963ef283e330364c8ee7
Shawn Willden [Thu, 19 Mar 2015 00:59:52 +0000 (18:59 -0600)]
Use extern "C" rather than BEGIN/END_DECLS.
For compatibility with Trusty. I'll probably revert this later after I
find a proper fix for Trusty.
Change-Id: I49b4ae55251398eec2a6633e09bbc468f16a4d14
Shawn Willden [Thu, 19 Mar 2015 00:43:47 +0000 (00:43 +0000)]
am
6b5b8ba9: am
201e5555: Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth token structure."
* commit '
6b5b8ba98e1caaa91693238e79bfe5b7d988ce5c':
Add KM_TAG_AUTH_TOKEN and corresponding auth token structure.
Shawn Willden [Thu, 19 Mar 2015 00:37:50 +0000 (00:37 +0000)]
am
201e5555: Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth token structure."
* commit '
201e5555b336bb5f9db7dd3215e8d6135ed5f146':
Add KM_TAG_AUTH_TOKEN and corresponding auth token structure.
Shawn Willden [Thu, 19 Mar 2015 00:23:33 +0000 (00:23 +0000)]
Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth token structure."
Shawn Willden [Wed, 18 Mar 2015 23:51:14 +0000 (23:51 +0000)]
am
98bf75b4: am
0eadc764: Merge "Add error codes."
* commit '
98bf75b4fd685373f3331b0a73ee7a2978bbec03':
Add error codes.
Shawn Willden [Sat, 14 Mar 2015 14:23:41 +0000 (08:23 -0600)]
Add KM_TAG_AUTH_TOKEN and corresponding auth token structure.
We may want to put the auth token structure elsewhere; it's consumed by
keymaster but produced by other components.
Bug:
19511945
Change-Id: Id9a22ad32137f3e0380c2812f790bbecab511d11
Shawn Willden [Wed, 18 Mar 2015 23:22:55 +0000 (23:22 +0000)]
am
0eadc764: Merge "Add error codes."
* commit '
0eadc764d1845fec360d8fad13141b2996c36e6d':
Add error codes.