summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | Add KM_TAG_USER_SECURE_ID.Shawn Willden2015-03-181-14/+19
* | | | | | | | Fix build error on 64-bitGlenn Kasten2015-03-231-3/+3
* | | | | | | | 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
* | | | | | | | | Rename keyguard to gatekeeperAndres Morales2015-03-201-19/+19
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge "Update keyguard API"Andres Morales2015-03-201-4/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Update keyguard APIAndres Morales2015-03-191-4/+10
* | | | | | | | 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
* | | | | | | | | am 4dfbc5e3: am 6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS."Shawn Willden2015-03-192-4/+12
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am 6a39dafe: Merge "Use extern "C" rather than BEGIN/END_DECLS."Shawn Willden2015-03-192-4/+12
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | 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
| | |/ / / / / /
* | | | | | | | am 6b5b8ba9: am 201e5555: Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth...Shawn Willden2015-03-192-6/+52
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 201e5555: Merge "Add KM_TAG_AUTH_TOKEN and corresponding auth token struct...Shawn Willden2015-03-192-6/+52
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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
* | | | | | | | | am 98bf75b4: am 0eadc764: Merge "Add error codes."Shawn Willden2015-03-181-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 0eadc764: Merge "Add error codes."Shawn Willden2015-03-181-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Add error codes."Shawn Willden2015-03-181-0/+5
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Add error codes.Shawn Willden2015-03-111-0/+5
| | |/ / / / / /
* | | | | | | | Merge "radio stub HAL."Eric Laurent2015-03-162-0/+753
|\ \ \ \ \ \ \ \
| * | | | | | | | radio stub HAL.Eric Laurent2015-03-122-0/+753
* | | | | | | | | Merge "initial radio HAL definition"Eric Laurent2015-03-161-0/+298
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | initial radio HAL definitionEric Laurent2015-03-101-0/+298
* | | | | | | | am fb69cf20: am 37467e5b: Merge "Add keymaster_key_param_compare function."Shawn Willden2015-03-131-0/+48
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 37467e5b: Merge "Add keymaster_key_param_compare function."Shawn Willden2015-03-121-0/+48
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | 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
* | | | | | | | | Camera3: Add rotation field to camera3_stream_tYin-Chia Yeh2015-03-121-2/+50
* | | | | | | | | 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
* | | | | | | | | 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
* | | | | | | | | | 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
| |/ / / / / / /
* | | | | | | | 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
* | | | | | | | 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
* | | | | | | | | am c7bea4fc: (-s ours) am a8d33714: (-s ours) DO NOT MERGE ANYWHERE Bluetooth...Andre Eisenbach2015-03-050-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | |
| * | | | | | | am a8d33714: (-s ours) DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging...Andre Eisenbach2015-03-050-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | DO NOT MERGE ANYWHERE Bluetooth native dumpsys logging support (1/4)Andre Eisenbach2015-03-041-0/+3
* | | | | | | | | camera_common: change torch status callback APIChien-Yu Chen2015-02-271-28/+31
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | am 55eb5b0c: am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymast...Shawn Willden2015-02-270-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am e05ffdbb: am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-270-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am 17dde875: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-265-200/+379
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden2015-02-265-200/+379
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | / | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-245-200/+379
| | | |/ / / /
* | | | | | | am ffaaf821: Separate keymaster0 and keymaster1 HALs.Shawn Willden2015-02-260-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /