summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
Commit message (Expand)AuthorAgeFilesLines
* Merge "Use DisplayAdjustments when creating display in ResourceManager" into ...Wale Ogunwale2015-06-081-11/+0
|\
| * Use DisplayAdjustments when creating display in ResourceManagerWale Ogunwale2015-06-061-11/+0
* | Merge "Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIED" ...Eino-Ville Talvala2015-06-061-10/+1
|\ \
| * | Camera2: Legacy: Do not remap EACCES error code to PERMISSION_DENIEDEino-Ville Talvala2015-06-041-10/+1
* | | Camera2: add missing HFR implementationZhijun He2015-06-051-3/+2
* | | Merge "Camera2: fix doc build" into mnc-devZhijun He2015-06-051-2/+2
|\ \ \
| * | | Camera2: fix doc buildZhijun He2015-06-041-2/+2
* | | | Merge "Camera2: implement high speed video APIs" into mnc-devZhijun He2015-06-057-19/+375
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Camera2: implement high speed video APIsZhijun He2015-06-047-19/+375
| |/
* | Merge "Camera: Change origin of poseTranslation." into mnc-devEino-Ville Talvala2015-06-042-12/+54
|\ \
| * | Camera: Change origin of poseTranslation.Eino-Ville Talvala2015-06-042-12/+54
* | | Merge "Fix CameraManager#open exception handling." into mnc-devRuben Brunk2015-06-041-4/+3
|\ \ \
| * | | Fix CameraManager#open exception handling.Ruben Brunk2015-06-041-4/+3
| | |/ | |/|
* | | Merge "CameraManager: Ensure all public methods connect to camera service." i...Eino-Ville Talvala2015-06-041-6/+12
|\ \ \ | |/ / |/| |
| * | CameraManager: Ensure all public methods connect to camera service.Eino-Ville Talvala2015-06-041-6/+12
| |/
* | Camera2: add high speed video APIsZhijun He2015-06-036-7/+196
* | camera_metadata: update high speed video recording APIZhijun He2015-06-032-18/+139
|/
* Merge "Camera2: Remove isLoggable" into mnc-devEino-Ville Talvala2015-06-0124-107/+104
|\
| * Camera2: Remove isLoggableEino-Ville Talvala2015-06-0124-107/+104
* | Merge "Camera2: Add tangential distortion coefficients" into mnc-devEino-Ville Talvala2015-06-012-24/+54
|\ \ | |/ |/|
| * Camera2: Add tangential distortion coefficientsEino-Ville Talvala2015-05-292-24/+54
* | Merge "Camera2: Add missing LEGACY available keys" into mnc-devYin-Chia Yeh2015-06-011-0/+2
|\ \
| * | Camera2: Add missing LEGACY available keysYin-Chia Yeh2015-06-011-0/+2
| |/
* | Merge "Camera2: update docs for reprocess timestamp" into mnc-devChien-Yu Chen2015-06-012-8/+20
|\ \
| * | Camera2: update docs for reprocess timestampChien-Yu Chen2015-05-292-8/+20
| |/
* | Merge "Bug fix and documentation clarification" into mnc-devPeng Xu2015-05-282-27/+36
|\ \
| * | Bug fix and documentation clarificationPeng Xu2015-05-212-27/+36
* | | Merge "Camera2: update legacy metadata" into mnc-devYin-Chia Yeh2015-05-281-0/+1
|\ \ \ | |_|/ |/| |
| * | Camera2: update legacy metadataYin-Chia Yeh2015-05-261-0/+1
* | | Merge "Camera: update available LSC map mode key type" into mnc-devYin-Chia Yeh2015-05-221-2/+2
|\ \ \ | |/ /
| * | Camera: update available LSC map mode key typeYin-Chia Yeh2015-05-221-2/+2
* | | Merge "Camera2: update FpsRange requirement" into mnc-devYin-Chia Yeh2015-05-221-2/+20
|\ \ \
| * | | Camera2: update FpsRange requirementYin-Chia Yeh2015-05-221-2/+20
| |/ /
* | | Merge "Camera2: Implement toString() for camera2 params" into mnc-devChien-Yu Chen2015-05-223-0/+194
|\ \ \
| * | | Camera2: Implement toString() for camera2 paramsChien-Yu Chen2015-05-223-0/+194
* | | | Merge "Camera2: Fix spelling mistake" into mnc-devEino-Ville Talvala2015-05-211-1/+1
|\ \ \ \
| * | | | Camera2: Fix spelling mistakeEino-Ville Talvala2015-05-211-1/+1
* | | | | Merge "Camera2: Fix CaptureRequest @see links" into mnc-devEino-Ville Talvala2015-05-211-2/+10
|\ \ \ \ \ | |/ / / /
| * | | | Camera2: Fix CaptureRequest @see linksEino-Ville Talvala2015-05-191-2/+10
* | | | | Merge "Move from native FingerprintService implementation to fingerprintd" in...Jim Miller2015-05-213-6/+66
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Move from native FingerprintService implementation to fingerprintdJim Miller2015-05-203-6/+66
* | | | | Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-devRuben Brunk2015-05-202-1/+35
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | camera: Add AIDL interface for CameraServiceProxy.Ruben Brunk2015-05-192-1/+35
* | | | | Merge "Camera2: Fix session close callback" into mnc-devEino-Ville Talvala2015-05-191-45/+26
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Camera2: Fix session close callbackEino-Ville Talvala2015-05-181-45/+26
| | |_|/ | |/| |
* | | | Merge "Camera2: Add SDK annotations" into mnc-devEino-Ville Talvala2015-05-1912-73/+188
|\ \ \ \ | |_|_|/ |/| | |
| * | | Camera2: Add SDK annotationsEino-Ville Talvala2015-05-1912-73/+188
| |/ /
* | | Camera2: stop log spamming when closing a closed cameraZhijun He2015-05-181-1/+0
|/ /
* | Merge "Camera2: get ride of sceneModeOverrides in API doc" into mnc-devZhijun He2015-05-152-2/+2
|\ \ | |/ |/|
| * Camera2: get ride of sceneModeOverrides in API docZhijun He2015-05-142-2/+2