OSDN Git Service

android-x86/hardware-libhardware.git
9 years agoMore usage support in the Input HAL.
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

9 years agoInput event hub for evdev input HAL module.
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

9 years agoMerge "Update fingerprint.h for new API"
Jim Miller [Wed, 25 Mar 2015 19:45:16 +0000 (19:45 +0000)]
Merge "Update fingerprint.h for new API"

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

9 years agoMerge "Camera: update test per interface change"
Yin-Chia Yeh [Tue, 24 Mar 2015 22:41:14 +0000 (22:41 +0000)]
Merge "Camera: update test per interface change"

9 years agoCamera: 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

9 years agoam 92469ed0: am f1babb18: Merge "Add KM_TAG_USER_SECURE_ID."
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.

9 years agoFix build error on 64-bit
Glenn Kasten [Mon, 23 Mar 2015 17:52:31 +0000 (10:52 -0700)]
Fix build error on 64-bit

Change-Id: I9a308bf6499a74efa8084a2e4df1f029b26f3d6c

9 years agoMerge "Creating audio.stub.default for default HAL audio output"
Ricardo Garcia [Mon, 23 Mar 2015 17:21:15 +0000 (17:21 +0000)]
Merge "Creating audio.stub.default for default HAL audio output"

9 years agoam f1babb18: Merge "Add KM_TAG_USER_SECURE_ID."
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.

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 agoRename keyguard to gatekeeper
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

9 years agoMerge "Update keyguard API"
Andres Morales [Fri, 20 Mar 2015 01:56:11 +0000 (01:56 +0000)]
Merge "Update keyguard API"

9 years agoMerge "Camera: Fix tests per camera service interface change"
Yin-Chia Yeh [Thu, 19 Mar 2015 17:27:27 +0000 (17:27 +0000)]
Merge "Camera: Fix tests per camera service interface change"

9 years agoUpdate keyguard API
Andres Morales [Thu, 19 Mar 2015 15:40:41 +0000 (08:40 -0700)]
Update keyguard API

Change-Id: I51f144134e58109ed6e9747926645bd956631ad4

9 years agoam 4dfbc5e3: am 6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS."
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.

9 years agoam 6a39dafe: Merge "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.

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 agoam 6b5b8ba9: am 201e5555: Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth token...
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.

9 years agoam 201e5555: Merge "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.

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 agoam 98bf75b4: am 0eadc764: Merge "Add error codes."
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.

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 agoam 0eadc764: Merge "Add error codes."
Shawn Willden [Wed, 18 Mar 2015 23:22:55 +0000 (23:22 +0000)]
am 0eadc764: Merge "Add error codes."

* commit '0eadc764d1845fec360d8fad13141b2996c36e6d':
  Add error codes.

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 agoCreating audio.stub.default for default HAL audio output
Ricardo Garcia [Mon, 23 Feb 2015 23:42:26 +0000 (15:42 -0800)]
Creating audio.stub.default for default HAL audio output

Creating a simple "stub" audio HAL to be used in systems with no
hardware output.  This stub HAL allows systems to run CTS tests and
other audio system calls without crashing or unexpected behavior.
The stub can be used also as a starting point for creating a new HAL.

This is needed for audio_output feature support.

bug: 19439530
Change-Id: I9e8e06e5b7fea7c7f3ff1de303db015b51e8acde

9 years agoCamera: Fix tests per camera service interface change
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

9 years agoMerge "radio stub HAL."
Eric Laurent [Mon, 16 Mar 2015 18:28:19 +0000 (18:28 +0000)]
Merge "radio stub HAL."

9 years agoMerge "initial radio HAL definition"
Eric Laurent [Mon, 16 Mar 2015 18:17:06 +0000 (18:17 +0000)]
Merge "initial radio HAL definition"

9 years agoam fb69cf20: am 37467e5b: Merge "Add keymaster_key_param_compare function."
Shawn Willden [Fri, 13 Mar 2015 06:32:51 +0000 (06:32 +0000)]
am fb69cf20: am 37467e5b: Merge "Add keymaster_key_param_compare function."

* commit 'fb69cf209e1207d10ce27d46e6718acffdbfc583':
  Add keymaster_key_param_compare function.

9 years agoradio stub HAL.
Eric Laurent [Thu, 5 Mar 2015 20:52:14 +0000 (12:52 -0800)]
radio stub HAL.

radio HAL stub implementation to be used for
test or reference.

Change-Id: I83294501d0bc138bcce68eb83296da6f6f4438d3

9 years agoCamera3: Add rotation field to camera3_stream_t
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

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 agoam 37467e5b: Merge "Add keymaster_key_param_compare function."
Shawn Willden [Thu, 12 Mar 2015 01:00:04 +0000 (01:00 +0000)]
am 37467e5b: Merge "Add keymaster_key_param_compare function."

* commit '37467e5b52a5db5dea0339d60ca1243e45e7a357':
  Add keymaster_key_param_compare function.

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 agoMerge "camera2: Update HAL docs on eviction behavior."
Ruben Brunk [Thu, 12 Mar 2015 00:21:34 +0000 (00:21 +0000)]
Merge "camera2: Update HAL docs on eviction behavior."

9 years agocamera2: Update HAL docs on eviction behavior.
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

9 years agoinitial radio HAL definition
Eric Laurent [Thu, 5 Mar 2015 20:51:04 +0000 (12:51 -0800)]
initial radio HAL definition

Added defintions for radio broadcast receiver HAL

Change-Id: Icd90e2b7b205af22b62eb957dff3cf6afc08294d

9 years agoMerge "Camera tests: Adjust for framework device interface changes"
Eino-Ville Talvala [Mon, 9 Mar 2015 23:29:12 +0000 (23:29 +0000)]
Merge "Camera tests: Adjust for framework device interface changes"

9 years agoMerge "Camera3: Add dataspace to camera HAL device stream configuration"
Eino-Ville Talvala [Mon, 9 Mar 2015 23:29:06 +0000 (23:29 +0000)]
Merge "Camera3: Add dataspace to camera HAL device stream configuration"

9 years agoCamera tests: Adjust for framework device interface changes
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

9 years agoCamera3: Add dataspace to camera HAL device stream configuration
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

9 years agoMerge "Change payload size to size_t and add uid param"
Andres Morales [Mon, 9 Mar 2015 18:12:14 +0000 (18:12 +0000)]
Merge "Change payload size to size_t and add uid param"

9 years agoChange payload size to size_t and add uid param
Andres Morales [Thu, 5 Feb 2015 18:49:58 +0000 (10:49 -0800)]
Change payload size to size_t and add uid param

Buffers will likely be bigger than 255!

Change-Id: I8cc1ac1c656493a94e5a41ce6ee948af159f18f6

9 years agoMerge "Replace/rename old HAL graphics formats"
Eino-Ville Talvala [Fri, 6 Mar 2015 22:13:08 +0000 (22:13 +0000)]
Merge "Replace/rename old HAL graphics formats"

9 years agoReplace/rename old HAL graphics formats
Eino-Ville Talvala [Fri, 6 Mar 2015 21:19:36 +0000 (13:19 -0800)]
Replace/rename old HAL graphics formats

 - Replace RAW_SENSOR with RAW16
 - Remove sRGB formats

Change-Id: Ic5c44878c638c3d3559495ea5685e10fcc2c39e1

9 years agoam c7bea4fc: (-s ours) am a8d33714: (-s ours) DO NOT MERGE ANYWHERE Bluetooth native...
Andre Eisenbach [Thu, 5 Mar 2015 00:28:55 +0000 (00:28 +0000)]
am c7bea4fc: (-s ours) am a8d33714: (-s ours) DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)

* commit 'c7bea4fcce8fa27bb56b174c1736815fa305ba44':
  DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)

9 years agoam a8d33714: (-s ours) DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support...
Andre Eisenbach [Thu, 5 Mar 2015 00:23:07 +0000 (00:23 +0000)]
am a8d33714: (-s ours) DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)

* commit 'a8d337147e2e1b834511bbe13a4c4970099bdd25':
  DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)

9 years agoDO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)
Andre Eisenbach [Fri, 5 Dec 2014 17:35:57 +0000 (09:35 -0800)]
DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)

Bug: 18508263
Change-Id: Id7b69a6ed7d817a0f048cb8ebf0889c600171926

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 agocamera_common: change torch status callback API
Chien-Yu Chen [Wed, 25 Feb 2015 22:50:13 +0000 (14:50 -0800)]
camera_common: change torch status callback API

Update the torch status callback API so that HAL must invoke
the torch status callback whenever the torch status changes
including changes by set_torch_mode().

The problem of the previous approach was camera service needed
to invoke the callback after calling set_torch_mode() and two
sources of the torch status changes (HAL and camera service)
caused a race condition.

Add STATUS_ON and remove STATUS_AVAILABLE which isn't useful
because STATUS_OFF means torch is off and available. STATUS_ON
means torch is on and available.

Bug: 2682206
Change-Id: Ide5d289c5f485404a3ba46e6cb359fa8a52da0bb

9 years agoam 55eb5b0c: am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymaster1...
Shawn Willden [Fri, 27 Feb 2015 00:51:42 +0000 (00:51 +0000)]
am 55eb5b0c: am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."

* commit '55eb5b0caf1eff3f50b7e8f86b7ff24a978be044':
  Separate keymaster0 and keymaster1 HALs.

9 years agoam e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."
Shawn Willden [Fri, 27 Feb 2015 00:43:17 +0000 (00:43 +0000)]
am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."

* commit 'e05ffdbb306d5e5b615a7e7a65c665010211b9b6':
  Separate keymaster0 and keymaster1 HALs.

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 agoam ffaaf821: Separate keymaster0 and keymaster1 HALs.
Shawn Willden [Thu, 26 Feb 2015 18:48:05 +0000 (18:48 +0000)]
am ffaaf821: Separate keymaster0 and keymaster1 HALs.

* commit 'ffaaf821c0845760cdf41c0bb3107db4ccb3a7fa':
  Separate keymaster0 and keymaster1 HALs.

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 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 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 8840a683: am 587d8313: am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."
Alex Klyubin [Tue, 24 Feb 2015 05:23:17 +0000 (05:23 +0000)]
am 8840a683: am 587d8313: am 4f5949b5: Merge "Clarify the meaning of KM_TAG_MAC_LENGTH."

* commit '8840a6833a4be28dddef0a3a318f0145b3f615cd':
  Clarify the meaning of KM_TAG_MAC_LENGTH.

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

* commit '587d8313d6d9d9f44ac2d8702676c02c792e1bf3':
  Clarify the meaning of KM_TAG_MAC_LENGTH.

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 agoMerge "Add input HAL header."
Michael Wright [Mon, 23 Feb 2015 19:35:10 +0000 (19:35 +0000)]
Merge "Add input HAL header."

9 years agoAdd input HAL header.
Michael Wright [Sat, 14 Feb 2015 01:31:41 +0000 (17:31 -0800)]
Add input HAL header.

Change-Id: Ia959dd1d1adf024459d2423fc9d59a811466e53c

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 agoBack out locking order and (over) simplification in out_write(), in_read().
Paul McLean [Fri, 20 Feb 2015 23:39:59 +0000 (15:39 -0800)]
Back out locking order and (over) simplification in out_write(), in_read().

Change-Id: I96954f883798f8e10adce56d9c33b70574999d1c

9 years agoUSB device disconnect latency
Paul McLean [Fri, 20 Feb 2015 19:12:56 +0000 (11:12 -0800)]
USB device disconnect latency

Eliminated unnecessay locking/unlocking in adev_set_parameters().
Corrected and simplified lock/unlock order in out_write() and in_read().

Bugs 19363750

Change-Id: Iede9a95f5f17645d9780b344fd5ee009cd9fa94d

9 years agoam 3cbe7142: am fb9ad66a: Merge commit \'d7cc04b275ea6d1cec863159327281b0ffbc8120...
Bill Yi [Fri, 20 Feb 2015 00:30:42 +0000 (00:30 +0000)]
am 3cbe7142: am fb9ad66a: Merge commit \'d7cc04b275ea6d1cec863159327281b0ffbc8120\' into HEAD

* commit '3cbe71422d9df74a2a1383f858fa81ea9b267cb7':

9 years agoam fb9ad66a: Merge commit \'d7cc04b275ea6d1cec863159327281b0ffbc8120\' into HEAD
Bill Yi [Fri, 20 Feb 2015 00:23:21 +0000 (00:23 +0000)]
am fb9ad66a: Merge commit \'d7cc04b275ea6d1cec863159327281b0ffbc8120\' into HEAD

* commit 'fb9ad66afd1591fffc24db04214f45a6abf96c59':

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 "camera_common: add -EUSERS to set_torch_mode"
Chien-Yu Chen [Thu, 19 Feb 2015 21:01:11 +0000 (21:01 +0000)]
Merge "camera_common: add -EUSERS to set_torch_mode"

9 years agoMerge "Improve locking/unlocking in *_set_params()."
Paul McLean [Wed, 18 Feb 2015 21:49:12 +0000 (21:49 +0000)]
Merge "Improve locking/unlocking in *_set_params()."

9 years agoImprove locking/unlocking in *_set_params().
Paul McLean [Wed, 18 Feb 2015 17:13:24 +0000 (09:13 -0800)]
Improve locking/unlocking in *_set_params().

Also clean up logging.
This doesn't completely fix the referenced bug, but substantially
reduces the instances of long latency on USB device disconnect.

Bug: 19363750

Change-Id: If0a6d64c4973277ae2474e121198e47df973965e

9 years agoam 66b7b389: am 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606
Shawn Willden [Wed, 18 Feb 2015 16:05:11 +0000 (16:05 +0000)]
am 66b7b389: am 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606

* commit '66b7b3899fdc76add9e728cebcde146b386210e0':
  Added insecure (chunkless) AEAD option.
  Add additional param lists to update and finish.

9 years agoam 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606
Shawn Willden [Wed, 18 Feb 2015 15:59:37 +0000 (15:59 +0000)]
am 0e5fca1c: Merge changes Id4bdfdcb,Ib94f3606

* commit '0e5fca1ca4777f5f5d5fa8bd0de139e42077881b':
  Added insecure (chunkless) AEAD option.
  Add additional param lists to update and finish.

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 agoam f18670b8: am 892ae44c: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"
Shawn Willden [Wed, 18 Feb 2015 11:39:14 +0000 (11:39 +0000)]
am f18670b8: am 892ae44c: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"

* commit 'f18670b802c85b393995596eee1f171f6d16852b':
  Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA

9 years agoam 87150001: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into...
Shawn Willden [Wed, 18 Feb 2015 11:38:57 +0000 (11:38 +0000)]
am 87150001: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into lmp-mr1-dev-plus-aosp

* commit '871500013a60c052475b219be3da10a8b6a9e66b':
  Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA

9 years agoam 892ae44c: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"
Shawn Willden [Wed, 18 Feb 2015 06:03:10 +0000 (06:03 +0000)]
am 892ae44c: Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"

* commit '892ae44c5f805f6ac64e6e756964c79998411742':
  Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA

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 agoMerge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into lmp-mr1-dev...
Shawn Willden [Wed, 18 Feb 2015 02:22:47 +0000 (02:22 +0000)]
Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA" into lmp-mr1-dev-plus-aosp

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 agoMerge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"
Shawn Willden [Wed, 18 Feb 2015 01:46:30 +0000 (01:46 +0000)]
Merge "Rename KM_TAG_ADDITIONAL_DATA to KM_TAG_ASSOCIATED_DATA"

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 agohardware: libhardware: introduce new fingerprint HAL 2.0 features.
Sasha Levitskiy [Thu, 11 Dec 2014 14:49:36 +0000 (06:49 -0800)]
hardware: libhardware: introduce new fingerprint HAL 2.0 features.

Change-Id: I4ab0a511417742a4b0b912ebf98a3773ec22bb10
Signed-off-by: Sasha Levitskiy <sanek@google.com>
9 years agoam d7cc04b2: am 6bdaf827: Merge "Add explicit values to keymaster_key_format_t"
Shawn Willden [Sat, 14 Feb 2015 01:04:48 +0000 (01:04 +0000)]
am d7cc04b2: am 6bdaf827: Merge "Add explicit values to keymaster_key_format_t"

* commit 'd7cc04b275ea6d1cec863159327281b0ffbc8120':
  Add explicit values to keymaster_key_format_t

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 agocamera_common: add -EUSERS to set_torch_mode
Chien-Yu Chen [Wed, 11 Feb 2015 19:31:12 +0000 (11:31 -0800)]
camera_common: add -EUSERS to set_torch_mode

To match the public API, seperate camera device in use and other
resources in use errors.

Bug: 2682206
Change-Id: Ie0451931f0c84fc65f3f6294a9f44bec10627afe

9 years agoam 4c2059d8: am adbfbb74: Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type
Nick Vaccaro [Wed, 11 Feb 2015 02:55:24 +0000 (02:55 +0000)]
am 4c2059d8: am adbfbb74: Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type

* commit '4c2059d8fbefad3d3f3c37079819ea8205809b17':
  Add new SENSOR_TYPE_WRIST_TILT_GESTURE sensor type

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 2c16d1e0: am a163e491: Merge "gralloc: clarify lock_ycbcr in light of multimedia...
Lajos Molnar [Wed, 4 Feb 2015 18:58:19 +0000 (18:58 +0000)]
am 2c16d1e0: am a163e491: Merge "gralloc: clarify lock_ycbcr in light of multimedia codec usage" into lmp-mr1-dev

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