OSDN Git Service

android-x86/hardware-libhardware.git
9 years agoMerge changes from topic 'system-bt'
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

9 years agoL2CAP and SDP Search API for BT profiles (1/2)
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

9 years agoIncorrect RSSI value in onlost/onfound
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

9 years agoOnFound/OnLost feature API changes based on spec v0.90
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

9 years agoMerge "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"

9 years agoMerge "Add KM_ORIGIN_UNKNOWN."
Shawn Willden [Tue, 14 Apr 2015 17:42:59 +0000 (17:42 +0000)]
Merge "Add KM_ORIGIN_UNKNOWN."

9 years agoAdd KM_ORIGIN_UNKNOWN.
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

9 years agoMerge "hw_auth_token: make timestamp 64 bits"
Andres Morales [Mon, 13 Apr 2015 17:58:13 +0000 (17:58 +0000)]
Merge "hw_auth_token: make timestamp 64 bits"

9 years agohw_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

9 years agoMerge "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"

9 years agoAdd 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

9 years agoMerge "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."

9 years agoMerge "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."

9 years agoMake several key crypto parameters repeatable.
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

9 years agoCorrect return type of delete_all_keys.
Shawn Willden [Wed, 8 Apr 2015 12:54:57 +0000 (06:54 -0600)]
Correct return type of delete_all_keys.

Change-Id: Ic868882a4b456913879f91562442ef233a58d09e

9 years agoMerge "Simplify keymaster_key_origin_t."
Shawn Willden [Fri, 10 Apr 2015 13:46:36 +0000 (13:46 +0000)]
Merge "Simplify keymaster_key_origin_t."

9 years agoSimplify 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

9 years agoMerge "Reduce the list of keymaster key formats 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."

9 years agoMerge "Reduce the list of keymaster padding modes 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."

9 years agoMerge "Reduce keymaster digest list to required set."
Shawn Willden [Fri, 10 Apr 2015 02:23:37 +0000 (02:23 +0000)]
Merge "Reduce keymaster digest list to required set."

9 years agoMerge "Reduce keymaster block modes to the required set."
Shawn Willden [Fri, 10 Apr 2015 02:23:18 +0000 (02:23 +0000)]
Merge "Reduce keymaster block modes to the required set."

9 years agoMerge "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."

9 years agoMerge "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."

9 years agoReduce the list of keymaster key formats to the required set.
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

9 years agoReduce the list of keymaster padding modes to the required set.
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

9 years agoReduce keymaster digest list to required set.
Shawn Willden [Tue, 7 Apr 2015 20:02:28 +0000 (14:02 -0600)]
Reduce keymaster digest list to required set.

Change-Id: Id5c660feb7e71ea76473523e3a86e1ba01f19c82

9 years agoReduce keymaster block modes to the required set.
Shawn Willden [Tue, 7 Apr 2015 19:40:00 +0000 (13:40 -0600)]
Reduce keymaster block modes to the required set.

Change-Id: I8f804978208e2c8701bd52dc79b5597a307b7e7a

9 years agoReduce keymaster algorithm list to the required set.
Shawn Willden [Tue, 7 Apr 2015 19:39:12 +0000 (13:39 -0600)]
Reduce keymaster algorithm list to the required set.

Change-Id: Ibffddc5c3a5c728182f5ca7f6a76381413fc8645

9 years agoStart authenticator numbering from 1, instead of 2.
Shawn Willden [Mon, 6 Apr 2015 17:50:04 +0000 (11:50 -0600)]
Start authenticator numbering from 1, instead of 2.

Change-Id: I44d94fd597ae7dec5199388b9ab0bd952cf831c3

9 years agoMerge "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."

9 years agoMerge "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."

9 years agoAdd KM_TAG_USER_SECURE_ID.
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

9 years agoUse extern "C" rather than BEGIN/END_DECLS.
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

9 years agoMerge "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."

9 years agoAdd KM_TAG_AUTH_TOKEN and corresponding auth token structure.
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

9 years agoMerge "Add error codes."
Shawn Willden [Wed, 18 Mar 2015 23:11:00 +0000 (23:11 +0000)]
Merge "Add error codes."

9 years agoAdd error codes.
Shawn Willden [Thu, 12 Mar 2015 03:53:59 +0000 (21:53 -0600)]
Add error codes.

Change-Id: I78cac1887fd41dd426e7d125a5f9c54e73188983

9 years agoMerge "Add keymaster_key_param_compare function."
Shawn Willden [Thu, 12 Mar 2015 00:39:24 +0000 (00:39 +0000)]
Merge "Add keymaster_key_param_compare function."

9 years agoAdd keymaster_key_param_compare function.
Shawn Willden [Wed, 4 Mar 2015 17:00:38 +0000 (10:00 -0700)]
Add keymaster_key_param_compare function.

This provides a reasonable ordering for params.

Change-Id: I1e3b403070d9e7621cc55c03ff9876ea3bbc699f

9 years agoam 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."
Shawn Willden [Thu, 26 Feb 2015 23:31:14 +0000 (23:31 +0000)]
am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."

* commit '17dde875dda1b96722e6fb07850c268ca716c3d1':
  Separate keymaster0 and keymaster1 HALs.

9 years agoMerge "Separate keymaster0 and keymaster1 HALs."
Shawn Willden [Thu, 26 Feb 2015 23:24:41 +0000 (23:24 +0000)]
Merge "Separate keymaster0 and keymaster1 HALs."

9 years agoHWC 1.5: Add per-layer damage region
Dan Stoza [Thu, 12 Feb 2015 18:11:21 +0000 (10:11 -0800)]
HWC 1.5: Add per-layer damage region

This adds an array of rects to hwc_layer_1_t that define which
portions of that layer's source buffer have been modified. If there
are a non-zero number of rects, then any portion of the source buffer
not touched by one of the rects may safely be assumed to not have
been modified. If no rects are defined, then the whole source buffer
must be assumed to have been modified.

Change-Id: Id5efafee74602ed7d76609180e334ed203c23f7e

9 years agoSeparate keymaster0 and keymaster1 HALs.
Shawn Willden [Tue, 24 Feb 2015 16:17:38 +0000 (09:17 -0700)]
Separate keymaster0 and keymaster1 HALs.

For now the keymaster1 HAL still includes all of the keymaster0 entry
points, and soft_keymaster_device will continue to implement them.  In
the near future the keymaster0 entry points will be removed, as soon as
we can ensure that keystore no longer needs them.

Change-Id: I5c54282c12d1c4b8b22ed4929b6e6c724a94ede4

9 years agoam 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."
Alex Klyubin [Tue, 24 Feb 2015 00:49:44 +0000 (00:49 +0000)]
am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."

* commit '4f5949b5dda4a2e95d29e1aa3effb22c678df21a':
  Clarify the meaning of KM_TAG_MAC_LENGTH.

9 years agoMerge "Clarify the meaning of KM_TAG_MAC_LENGTH."
Alex Klyubin [Tue, 24 Feb 2015 00:43:51 +0000 (00:43 +0000)]
Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."

9 years agoClarify the meaning of KM_TAG_MAC_LENGTH.
Alex Klyubin [Sat, 21 Feb 2015 00:42:23 +0000 (16:42 -0800)]
Clarify the meaning of KM_TAG_MAC_LENGTH.

Change-Id: I18478923059783e955613142a8d3352f98f5d7b0

9 years agoMerge commit 'd7cc04b275ea6d1cec863159327281b0ffbc8120' into HEAD
Bill Yi [Thu, 19 Feb 2015 22:31:52 +0000 (14:31 -0800)]
Merge commit 'd7cc04b275ea6d1cec863159327281b0ffbc8120' into HEAD

9 years agoMerge changes Id4bdfdcb,Ib94f3606
Shawn Willden [Wed, 18 Feb 2015 15:48:03 +0000 (15:48 +0000)]
Merge changes Id4bdfdcb,Ib94f3606

* changes:
  Added insecure (chunkless) AEAD option.
  Add additional param lists to update and finish.

9 years agoMerge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"
Shawn Willden [Wed, 18 Feb 2015 05:50:06 +0000 (05:50 +0000)]
Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"

9 years agoam 6bdaf827: Merge "Add explicit values to keymaster_key_format_t"
Shawn Willden [Sat, 14 Feb 2015 00:53:14 +0000 (00:53 +0000)]
am 6bdaf827: Merge "Add explicit values to keymaster_key_format_t"

* commit '6bdaf827ef59975efbf73b2d5b4228fb61c36123':
  Add explicit values to keymaster_key_format_t

9 years agoMerge "Add explicit values to keymaster_key_format_t"
Shawn Willden [Sat, 14 Feb 2015 00:40:41 +0000 (00:40 +0000)]
Merge "Add explicit values to keymaster_key_format_t"

9 years agoAdd explicit values to keymaster_key_format_t
Chad Brubaker [Fri, 13 Feb 2015 21:58:36 +0000 (13:58 -0800)]
Add explicit values to keymaster_key_format_t

Change-Id: I4113286396b16ca687fbd8bc38b2f16063fc1024

9 years agoam adbfbb74: Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
Nick Vaccaro [Wed, 11 Feb 2015 00:20:54 +0000 (00:20 +0000)]
am adbfbb74: Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type

* commit 'adbfbb747de9fe1efc21fc83f6591e7d13c81c36':
  Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type

9 years agoAdded insecure (chunkless) AEAD option.
Shawn Willden [Tue, 10 Feb 2015 21:29:46 +0000 (14:29 -0700)]
Added insecure (chunkless) AEAD option.

Also moved chunk length specification to operation parameter rather than
keygen parameter.

Change-Id: Id4bdfdcb1c7b64b3f22b4027e037e37c2860ec39

9 years agoRename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA
Shawn Willden [Sat, 7 Feb 2015 00:04:53 +0000 (17:04 -0700)]
Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA

Change-Id: Ieddd706ee205100719f7e2f9e18b3d9b07c37669

9 years agoAdd additional param lists to update and finish.
Shawn Willden [Sat, 7 Feb 2015 00:01:53 +0000 (17:01 -0700)]
Add additional param lists to update and finish.

At the moment this is to accommodate associated data for AEAD modes, but
there may be other parameters in the future.

Change-Id: Ib94f3606e3f714f6fa75bf0d4bd75804d9a8db4e

9 years agoAdd new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
Nick Vaccaro [Tue, 13 Jan 2015 20:14:28 +0000 (12:14 -0800)]
Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type

Adds a new sensor type for converting the Android Wear defined wrist
tilt sensor type into an official android sensor type.

Change-Id: If6357aeb463a556a68a19b28931edec04f99a952

9 years agoam a163e491: Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage...
Lajos Molnar [Wed, 4 Feb 2015 15:49:31 +0000 (15:49 +0000)]
am a163e491: Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into lmp-mr1-dev

* commit 'a163e491c148468884520d6d331a0f6d19104677':
  gralloc: clarify lock_ycbcr in light of multimedia codec usage

9 years agoMerge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into lmp-mr1-dev
Lajos Molnar [Wed, 4 Feb 2015 07:18:02 +0000 (07:18 +0000)]
Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into lmp-mr1-dev

9 years agoam 949d6d4b: Merge changes I38700cda,I088e6094
Shawn Willden [Tue, 3 Feb 2015 20:41:29 +0000 (20:41 +0000)]
am 949d6d4b: Merge changes I38700cda,I088e6094

* commit '949d6d4bfc1cf37a84d5d4ac00a20017941fdeba':
  Add raw key format, for symmetric key import.
  Remove "required" label from DSA algorithm.

9 years agoMerge changes I38700cda,I088e6094
Shawn Willden [Tue, 3 Feb 2015 20:30:05 +0000 (20:30 +0000)]
Merge changes I38700cda,I088e6094

* changes:
  Add raw key format, for symmetric key import.
  Remove "required" label from DSA algorithm.

9 years agoAdd raw key format, for symmetric key import.
Shawn Willden [Tue, 3 Feb 2015 18:12:20 +0000 (11:12 -0700)]
Add raw key format, for symmetric key import.

Change-Id: I38700cdafcf1f244584d6e88f8d9540c70a7de56

9 years agoRemove "required" label from DSA algorithm.
Shawn Willden [Tue, 3 Feb 2015 18:10:48 +0000 (11:10 -0700)]
Remove "required" label from DSA algorithm.

Change-Id: I088e6094ec56f434356d11ab2032b1a5b1223334

9 years agoam f3391a93: Merge changes I4ef53a09,I7c3c5bd5
Shawn Willden [Mon, 2 Feb 2015 23:39:20 +0000 (23:39 +0000)]
am f3391a93: Merge changes I4ef53a09,I7c3c5bd5

* commit 'f3391a93188de86f7e15859e613faba94f65cdbc':
  Remove get_output_size() method from keymaster HAL.
  Add tag to allow caller-specified nonce.

9 years agoMerge changes I4ef53a09,I7c3c5bd5
Shawn Willden [Mon, 2 Feb 2015 23:19:31 +0000 (23:19 +0000)]
Merge changes I4ef53a09,I7c3c5bd5

* changes:
  Remove get_output_size() method from keymaster HAL.
  Add tag to allow caller-specified nonce.

9 years agoRemove get_output_size() method from keymaster HAL.
Shawn Willden [Mon, 2 Feb 2015 18:50:57 +0000 (11:50 -0700)]
Remove get_output_size() method from keymaster HAL.

Rather than requiring implementations to be able to predict output
sizes, we'll just have the Java layer make a very conservative guess.

Change-Id: I4ef53a09d122d4ecf0c80b9dadc9c7a9073561cc

9 years agoAdd tag to allow caller-specified nonce.
Shawn Willden [Fri, 30 Jan 2015 13:23:26 +0000 (06:23 -0700)]
Add tag to allow caller-specified nonce.

Change-Id: I7c3c5bd5f26a4d465554c998f673e0ee2ab8b86e

9 years agoam d5f7dbec: audio: Add audio parameter key for device connect
Haynes Mathew George [Mon, 2 Feb 2015 15:29:58 +0000 (15:29 +0000)]
am d5f7dbec: audio: Add audio parameter key for device connect

* commit 'd5f7dbec0cac2d0e638025e43f8fb0d611d22bfa':
  audio: Add audio parameter key for device connect

9 years agoam ee844515: Merge "Fix "error: \'strlen\' was not declared in this scope"."
Elliott Hughes [Sat, 31 Jan 2015 07:49:22 +0000 (07:49 +0000)]
am ee844515: Merge "Fix "error: \'strlen\' was not declared in this scope"."

* commit 'ee84451582a1ccf3a177726f2848b64670c88437':
  Fix "error: 'strlen' was not declared in this scope".

9 years agoMerge "Fix "error: 'strlen' was not declared in this scope"."
Elliott Hughes [Sat, 31 Jan 2015 04:41:51 +0000 (04:41 +0000)]
Merge "Fix "error: 'strlen' was not declared in this scope"."

9 years agoFix "error: 'strlen' was not declared in this scope".
Elliott Hughes [Sat, 31 Jan 2015 04:40:50 +0000 (20:40 -0800)]
Fix "error: 'strlen' was not declared in this scope".

Change-Id: I8ae39a6b3cf4844429e6211b3c909c6f72978832

9 years agoaudio: Add audio parameter key for device connect
Haynes Mathew George [Thu, 25 Sep 2014 02:10:12 +0000 (19:10 -0700)]
audio: Add audio parameter key for device connect

Add audio parameter key for device connect.

Bug: 17785277
Bug: 19214836
Change-Id: Icd81702634e0bd83645d89c2d65e2b303fc11f8c
(cherry picked from commit 55c07c3418a3bc19a72c4935d8ed57a57074c49a)

9 years agoam ac41815a: Merge "Add missing includes."
Elliott Hughes [Fri, 30 Jan 2015 21:16:31 +0000 (21:16 +0000)]
am ac41815a: Merge "Add missing includes."

* commit 'ac41815a99763b3e59d0f2f9ef2bb3e5a2011336':
  Add missing includes.

9 years agogralloc: clarify lock_ycbcr in light of multimedia codec usage
Lajos Molnar [Fri, 30 Jan 2015 19:01:47 +0000 (11:01 -0800)]
gralloc: clarify lock_ycbcr in light of multimedia codec usage

Bug: 19179927
Change-Id: I53886f8d1a3a998b958f031b04ddd4cbf19aad2c

9 years agoMerge "Add missing includes."
Elliott Hughes [Fri, 30 Jan 2015 06:25:47 +0000 (06:25 +0000)]
Merge "Add missing includes."

9 years agoAdd missing includes.
Elliott Hughes [Fri, 30 Jan 2015 05:19:10 +0000 (21:19 -0800)]
Add missing includes.

Change-Id: I91730363386dae6ecb2193ec8f50ba9f8fc0ad60

9 years agoam b2bc0e51: camera3: update ZSL spec
Zhijun He [Thu, 29 Jan 2015 23:49:04 +0000 (23:49 +0000)]
am b2bc0e51: camera3: update ZSL spec

* commit 'b2bc0e518278b228d8b4c6bd324f04237feb92c3':
  camera3: update ZSL spec

9 years agocamera3: update ZSL spec
Zhijun He [Thu, 29 Jan 2015 22:44:37 +0000 (14:44 -0800)]
camera3: update ZSL spec

INPUT stream is not used by framework-implemented ZSL (HAL3.2), the sample
use case description is incorrect.

Bug: 19197776
Change-Id: I247ad8755b2197c2a62cc109c151749b42a4bd49

9 years agoam f4530d6e: Merge "Add missing includes."
Elliott Hughes [Thu, 29 Jan 2015 05:21:41 +0000 (05:21 +0000)]
am f4530d6e: Merge "Add missing includes."

* commit 'f4530d6eed5fa432fe9283355a265a38aea58bc6':
  Add missing includes.

9 years agoMerge "Add missing includes."
Elliott Hughes [Thu, 29 Jan 2015 04:59:25 +0000 (04:59 +0000)]
Merge "Add missing includes."

9 years agoAdd missing includes.
Elliott Hughes [Thu, 29 Jan 2015 03:54:13 +0000 (19:54 -0800)]
Add missing includes.

Change-Id: Ia74cceea707e51195a570eed37d4b334ac413773

9 years agoam 1e541c22: Merge changes I85f430fb,I514a136b
Shawn Willden [Thu, 29 Jan 2015 01:00:58 +0000 (01:00 +0000)]
am 1e541c22: Merge changes I85f430fb,I514a136b

* commit '1e541c22d3552b116f0ab3e3a826f458b2821673':
  Remove extraneous 'const' on rescope.
  Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.

9 years agoam 1309477b: Merge "Add missing "const" on add_rng_entropy argument."
Shawn Willden [Thu, 29 Jan 2015 01:00:57 +0000 (01:00 +0000)]
am 1309477b: Merge "Add missing "const" on add_rng_entropy argument."

* commit '1309477bdaaecc35b468f00045d9b1d005dde377':
  Add missing "const" on add_rng_entropy argument.

9 years agoMerge changes I85f430fb,I514a136b
Shawn Willden [Thu, 29 Jan 2015 00:45:57 +0000 (00:45 +0000)]
Merge changes I85f430fb,I514a136b

* changes:
  Remove extraneous 'const' on rescope.
  Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to KM_ERROR_UNSUPPORTED_MAC_LENGTH.

9 years agoMerge "Add missing "const" on add_rng_entropy argument."
Shawn Willden [Thu, 29 Jan 2015 00:44:56 +0000 (00:44 +0000)]
Merge "Add missing "const" on add_rng_entropy argument."

9 years agoRemove extraneous 'const' on rescope.
Shawn Willden [Mon, 26 Jan 2015 23:19:49 +0000 (16:19 -0700)]
Remove extraneous 'const' on rescope.

Change-Id: I85f430fb902fad75f7ce272ac5ab420f212a133c

9 years agoRename KM_ERROR_UNSUPPORTED_TAG_LENGTH to
Shawn Willden [Mon, 26 Jan 2015 20:04:28 +0000 (13:04 -0700)]
Rename KM_ERROR_UNSUPPORTED_TAG_LENGTH to
KM_ERROR_UNSUPPORTED_MAC_LENGTH.

Change-Id: I514a136b5cbdb1ab1df67d44a22d68a09427a711

9 years agoAdd missing "const" on add_rng_entropy argument.
Shawn Willden [Mon, 26 Jan 2015 20:03:58 +0000 (13:03 -0700)]
Add missing "const" on add_rng_entropy argument.

Change-Id: I584feed0f89f4342e94cc83e165904c78687f610

9 years agoam 7b8e44f5: Merge "Remove superfluous OpenSSL include paths."
Kenny Root [Mon, 26 Jan 2015 19:12:19 +0000 (19:12 +0000)]
am 7b8e44f5: Merge "Remove superfluous OpenSSL include paths."

* commit '7b8e44f511fdb5bd2730e29cc88f72305cf7ab16':
  Remove superfluous OpenSSL include paths.

9 years agoMerge "Remove superfluous OpenSSL include paths."
Kenny Root [Mon, 26 Jan 2015 18:52:53 +0000 (18:52 +0000)]
Merge "Remove superfluous OpenSSL include paths."

9 years agoam 79c255ad: Merge "Change per-boot tag and remove rescope auth timeout tag."
Shawn Willden [Fri, 23 Jan 2015 22:21:44 +0000 (22:21 +0000)]
am 79c255ad: Merge "Change per-boot tag and remove rescope auth timeout tag."

* commit '79c255ade3ed7ab00db8041dbf7e2a171cbc32b0':
  Change per-boot tag and remove rescope auth timeout tag.

9 years agoMerge "Change per-boot tag and remove rescope auth timeout tag."
Shawn Willden [Fri, 23 Jan 2015 22:04:53 +0000 (22:04 +0000)]
Merge "Change per-boot tag and remove rescope auth timeout tag."

9 years agoChange per-boot tag and remove rescope auth timeout tag.
Shawn Willden [Fri, 23 Jan 2015 08:01:21 +0000 (01:01 -0700)]
Change per-boot tag and remove rescope auth timeout tag.

Change the boolean KM_TAG_SINGLE_USE_PER_BOOT to an integer-valued
KM_TAG_USES_PER_BOOT.  This makes it more flexible without changing
implementation complexity.

Remove KM_TAG_RESCOPE_AUTH_TIMEOUT because there's no clear use case and
it seems unnecessarily complex.

Change-Id: Iad1512f5cc80f517e5ea7622288179c162bed2ad

9 years agoRemove superfluous OpenSSL include paths.
Adam Langley [Fri, 23 Jan 2015 01:16:01 +0000 (17:16 -0800)]
Remove superfluous OpenSSL include paths.

The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.

Change-Id: I9030a3747b8a1f18acd0308746cb2f63d4123f8b

9 years agoam b1a12188: Merge "Define keymaster HAL v0.4."
Shawn Willden [Thu, 22 Jan 2015 21:36:14 +0000 (21:36 +0000)]
am b1a12188: Merge "Define keymaster HAL v0.4."

* commit 'b1a1218845eb32564b2f7f0297096ec43b27e41b':
  Define keymaster HAL v0.4.

9 years agoMerge "Define keymaster HAL v0.4."
Shawn Willden [Thu, 22 Jan 2015 21:28:56 +0000 (21:28 +0000)]
Merge "Define keymaster HAL v0.4."

9 years agoDefine keymaster HAL v0.4.
Shawn Willden [Thu, 12 Jun 2014 19:48:46 +0000 (13:48 -0600)]
Define keymaster HAL v0.4.

Change-Id: I040412443bbbe25bce3d44759d710b78eac36caa

9 years agoam 8b7eca86: CEC: Add a new flag for set_option
Jinsuk Kim [Mon, 19 Jan 2015 02:49:37 +0000 (02:49 +0000)]
am 8b7eca86: CEC: Add a new flag for set_option

* commit '8b7eca867492d8a08285059492ce5697b68b5821':
  CEC: Add a new flag for set_option

9 years agoCEC: Add a new flag for set_option
Jinsuk Kim [Sun, 18 Jan 2015 22:20:09 +0000 (07:20 +0900)]
CEC: Add a new flag for set_option

Added a flag to pass system language information to HAL so that it can
respond to <Get Menu Language> in standby mode.

Bug: 19054079

Change-Id: Iada00307202f5c9429944184b62b6456b624125a

9 years agoMerge commit '83b47a68' into manualmerge
Eric Laurent [Sat, 10 Jan 2015 01:03:27 +0000 (17:03 -0800)]
Merge commit '83b47a68' into manualmerge