OSDN Git Service
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: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: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."
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 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
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.
Shawn Willden [Wed, 18 Mar 2015 23:11:00 +0000 (23:11 +0000)]
Merge "Add error codes."
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
Zhijun He [Fri, 9 Jan 2015 01:40:00 +0000 (17:40 -0800)]
usbcamera: initial implementation of default usb camera HAL
* Basic skeleton of usb camera hal implementation
* Vendor tag is not supported yet
* Further usb camera hal implementation can be filled into UsbCamera.cpp
* Hot plug thread need to be implemented
Change-Id: Ida63b6d640e32192f5b60a280d9d5106d80e523f
Yin-Chia Yeh [Tue, 3 Feb 2015 00:20:46 +0000 (16:20 -0800)]
Camera: modify test per framework interface change
Wrap camera_module_t by CameraModule to follow
framework interface change.
Change-Id: Ief423a1571cf06c7ef80b98b403a33969baf95f6
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
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
Zhijun He [Sat, 17 Jan 2015 00:44:40 +0000 (16:44 -0800)]
camera3: update reprocessing spec
Also bump the HAL version to 3.3 for reprocessing spec update
Change-Id: I37eda90970eace23c42ba9106d4db1587df8d1b4
Chien-Yu Chen [Thu, 29 Jan 2015 23:12:47 +0000 (15:12 -0800)]
camera_common: add TORCH_MODE_STATUS_OFF
Add TORCH_MODE_STATUS_OFF for the case when HAL has to turn off the
torch mode that was turned on by a previous set_torch_mode() call
in order to turn on the torch mode for the current set_torch_mode()
call.
Bug:
2682206
Change-Id: Ia2f717ffaca8c4346ec5fcdf73895160f700f067
Ruben Brunk [Fri, 16 Jan 2015 22:29:21 +0000 (14:29 -0800)]
camera HAL: Update camera_info with simultaneous access information.
- Add necessary metadata to the camera_info structure to allow
the camera service to determine which devices can be safely
opened and used simultaneously without attempting to open
camera devices.
Change-Id: I4250b4c7e1296ebf4cab07355d6d3be01f17ba1e
Zhijun He [Mon, 12 Jan 2015 22:45:33 +0000 (14:45 -0800)]
camera: update HAL module API for external camera
Update camera module API 2.4 for usb camera support.
Change-Id: Id8329e31ad0622bdc06c60e87e97c742a9719b3b
Chien-Yu Chen [Thu, 8 Jan 2015 19:06:38 +0000 (11:06 -0800)]
camera_common: add torch mode APIs for flashlight
Add torch mode APIs to support flashlight without opening any
camera devices.
Bug:
2682206
Change-Id: Ida46bb878962caf305f3e97051b15e0465fe8c02
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
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
Eric Laurent [Mon, 16 Mar 2015 18:28:19 +0000 (18:28 +0000)]
Merge "radio stub HAL."
Eric Laurent [Mon, 16 Mar 2015 18:17:06 +0000 (18:17 +0000)]
Merge "initial radio HAL definition"
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.
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
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
Shawn Willden [Thu, 12 Mar 2015 03:53:59 +0000 (21:53 -0600)]
Add error codes.
Change-Id: I78cac1887fd41dd426e7d125a5f9c54e73188983
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.
Shawn Willden [Thu, 12 Mar 2015 00:39:24 +0000 (00:39 +0000)]
Merge "Add keymaster_key_param_compare function."
Ruben Brunk [Thu, 12 Mar 2015 00:21:34 +0000 (00:21 +0000)]
Merge "camera2: 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
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
Eino-Ville Talvala [Mon, 9 Mar 2015 23:29:12 +0000 (23:29 +0000)]
Merge "Camera tests: Adjust for framework device interface changes"
Eino-Ville Talvala [Mon, 9 Mar 2015 23:29:06 +0000 (23:29 +0000)]
Merge "Camera3: Add dataspace to camera HAL device stream configuration"
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
Andres Morales [Mon, 9 Mar 2015 18:12:14 +0000 (18:12 +0000)]
Merge "Change 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
Eino-Ville Talvala [Fri, 6 Mar 2015 22:13:08 +0000 (22:13 +0000)]
Merge "Replace/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
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)
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)
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
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
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
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.
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.
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.
Shawn Willden [Thu, 26 Feb 2015 23:24:41 +0000 (23:24 +0000)]
Merge "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.
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
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