summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | Add KM_TAG_USER_SECURE_ID.Shawn Willden2015-03-181-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Fix build error on 64-bitGlenn Kasten2015-03-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a308bf6499a74efa8084a2e4df1f029b26f3d6c
* | | | | | | | Merge "Creating audio.stub.default for default HAL audio output"Ricardo Garcia2015-03-232-7/+71
|\ \ \ \ \ \ \ \
| * | | | | | | | Creating audio.stub.default for default HAL audio outputRicardo Garcia2015-03-172-7/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Rename keyguard to gatekeeperAndres Morales2015-03-201-19/+19
| |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids confusion with the other part of the system known as Keyguard. Change-Id: Ie32a3a4c990c4317cfd462a0e6dbf8fc490d4de2
* | | | | | | | Merge "Update keyguard API"Andres Morales2015-03-201-4/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Update keyguard APIAndres Morales2015-03-191-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I51f144134e58109ed6e9747926645bd956631ad4
* | | | | | | | Merge "Camera: Fix tests per camera service interface change"Yin-Chia Yeh2015-03-193-2/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Camera: Fix tests per camera service interface changeYin-Chia Yeh2015-03-163-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also clarify rotation field has no meaning and will always be 0 for a input stream. Change-Id: I0f4343a0bfa7bf09ba887c78a1da1c08daa35333
* | | | | | | | | am 4dfbc5e3: am 6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS."Shawn Willden2015-03-192-4/+12
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '4dfbc5e320eaf0bfdc0af242ac16153143d4ba4c': Use extern "C" rather than BEGIN/END_DECLS.
| * | | | | | | | am 6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS."Shawn Willden2015-03-192-4/+12
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '6a39dafe872d4e1b3da8df4c4e5e79b66109e3d9': Use extern "C" rather than BEGIN/END_DECLS.
| | * | | | | | | Merge "Use extern "C" rather than BEGIN/END_DECLS."Shawn Willden2015-03-192-4/+12
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Use extern "C" rather than BEGIN/END_DECLS.Shawn Willden2015-03-182-4/+12
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For compatibility with Trusty. I'll probably revert this later after I find a proper fix for Trusty. Change-Id: I49b4ae55251398eec2a6633e09bbc468f16a4d14
* | | | | | | | am 6b5b8ba9: am 201e5555: Merge "Add KM_TAG_AUTH_TOKEN and corresponding ↵Shawn Willden2015-03-192-6/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | auth token structure." * commit '6b5b8ba98e1caaa91693238e79bfe5b7d988ce5c': Add KM_TAG_AUTH_TOKEN and corresponding auth token structure.
| * | | | | | | am 201e5555: Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth token ↵Shawn Willden2015-03-192-6/+52
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | structure." * commit '201e5555b336bb5f9db7dd3215e8d6135ed5f146': Add KM_TAG_AUTH_TOKEN and corresponding auth token structure.
| | * | | | | | Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth token structure."Shawn Willden2015-03-192-6/+52
| | |\ \ \ \ \ \
| | | * | | | | | Add KM_TAG_AUTH_TOKEN and corresponding auth token structure.Shawn Willden2015-03-182-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | am 98bf75b4: am 0eadc764: Merge "Add error codes."Shawn Willden2015-03-181-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '98bf75b4fd685373f3331b0a73ee7a2978bbec03': Add error codes.
| * | | | | | | | am 0eadc764: Merge "Add error codes."Shawn Willden2015-03-181-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0eadc764d1845fec360d8fad13141b2996c36e6d': Add error codes.
| | * | | | | | | Merge "Add error codes."Shawn Willden2015-03-181-0/+5
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Add error codes.Shawn Willden2015-03-111-0/+5
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I78cac1887fd41dd426e7d125a5f9c54e73188983
* | | | | | | | Merge "radio stub HAL."Eric Laurent2015-03-162-0/+753
|\ \ \ \ \ \ \ \
| * | | | | | | | radio stub HAL.Eric Laurent2015-03-122-0/+753
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | radio HAL stub implementation to be used for test or reference. Change-Id: I83294501d0bc138bcce68eb83296da6f6f4438d3
* | | | | | | | | Merge "initial radio HAL definition"Eric Laurent2015-03-161-0/+298
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | initial radio HAL definitionEric Laurent2015-03-101-0/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added defintions for radio broadcast receiver HAL Change-Id: Icd90e2b7b205af22b62eb957dff3cf6afc08294d
* | | | | | | | am fb69cf20: am 37467e5b: Merge "Add keymaster_key_param_compare function."Shawn Willden2015-03-131-0/+48
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'fb69cf209e1207d10ce27d46e6718acffdbfc583': Add keymaster_key_param_compare function.
| * | | | | | | am 37467e5b: Merge "Add keymaster_key_param_compare function."Shawn Willden2015-03-121-0/+48
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '37467e5b52a5db5dea0339d60ca1243e45e7a357': Add keymaster_key_param_compare function.
| | * | | | | | Merge "Add keymaster_key_param_compare function."Shawn Willden2015-03-121-0/+48
| | |\ \ \ \ \ \
| | | * | | | | | Add keymaster_key_param_compare function.Shawn Willden2015-03-041-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides a reasonable ordering for params. Change-Id: I1e3b403070d9e7621cc55c03ff9876ea3bbc699f
* | | | | | | | | Camera3: Add rotation field to camera3_stream_tYin-Chia Yeh2015-03-121-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | Merge "camera2: Update HAL docs on eviction behavior."Ruben Brunk2015-03-121-10/+115
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | camera2: Update HAL docs on eviction behavior.Ruben Brunk2015-03-111-10/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19186859 Change-Id: Ie051f966a758c68d354250c245a87df57a4f4ae3
* | | | | | | | | Merge "Camera tests: Adjust for framework device interface changes"Eino-Ville Talvala2015-03-092-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera tests: Adjust for framework device interface changesEino-Ville Talvala2015-03-092-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Account for requirement to pass in dataspace in stream creation. Change-Id: Ibc5af912ef4a55b787c70843fc82422977a02c0b
* | | | | | | | | | Merge "Camera3: Add dataspace to camera HAL device stream configuration"Eino-Ville Talvala2015-03-091-0/+34
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Camera3: Add dataspace to camera HAL device stream configurationEino-Ville Talvala2015-03-091-0/+34
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "Change payload size to size_t and add uid param"Andres Morales2015-03-091-6/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Change payload size to size_t and add uid paramAndres Morales2015-03-091-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Buffers will likely be bigger than 255! Change-Id: I8cc1ac1c656493a94e5a41ce6ee948af159f18f6
* | | | | | | | Merge "Replace/rename old HAL graphics formats"Eino-Ville Talvala2015-03-068-24/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace/rename old HAL graphics formatsEino-Ville Talvala2015-03-068-24/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Replace RAW_SENSOR with RAW16 - Remove sRGB formats Change-Id: Ic5c44878c638c3d3559495ea5685e10fcc2c39e1
* | | | | | | | | am c7bea4fc: (-s ours) am a8d33714: (-s ours) DO NOT MERGE ANYWHERE ↵Andre Eisenbach2015-03-050-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Bluetooth native dumpsys logging support (1/4) * commit 'c7bea4fcce8fa27bb56b174c1736815fa305ba44': DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)
| * | | | | | | am a8d33714: (-s ours) DO NOT MERGE ANYWHERE Bluetooth native dumpsys ↵Andre Eisenbach2015-03-050-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logging support (1/4) * commit 'a8d337147e2e1b834511bbe13a4c4970099bdd25': DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)
| | * | | | | | | DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)Andre Eisenbach2015-03-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18508263 Change-Id: Id7b69a6ed7d817a0f048cb8ebf0889c600171926
* | | | | | | | | camera_common: change torch status callback APIChien-Yu Chen2015-02-271-28/+31
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am 55eb5b0c: am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and ↵Shawn Willden2015-02-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keymaster1 HALs." * commit '55eb5b0caf1eff3f50b7e8f86b7ff24a978be044': Separate keymaster0 and keymaster1 HALs.
| * | | | | | | am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-270-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit 'e05ffdbb306d5e5b615a7e7a65c665010211b9b6': Separate keymaster0 and keymaster1 HALs.
| | * | | | | | am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-265-200/+379
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '17dde875dda1b96722e6fb07850c268ca716c3d1': Separate keymaster0 and keymaster1 HALs.
| | | * \ \ \ \ \ Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-265-200/+379
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | / | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-245-200/+379
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am ffaaf821: Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-260-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ffaaf821c0845760cdf41c0bb3107db4ccb3a7fa': Separate keymaster0 and keymaster1 HALs.