summaryrefslogtreecommitdiffstats
path: root/core/java/android/hardware
Commit message (Expand)AuthorAgeFilesLines
* Merge "Camera2: Update availableFormats related key docs"Zhijun He2014-04-291-9/+12
|\
| * Camera2: Update availableFormats related key docsZhijun He2014-04-291-9/+12
* | Merge "CameraDevice: Make sure log tags are within length bounds."Eino-Ville Talvala2014-04-281-1/+8
|\ \ | |/ |/|
| * CameraDevice: Make sure log tags are within length bounds.Eino-Ville Talvala2014-04-281-1/+8
* | Make sure FLP HAL statuses currently used are translated (if needed) correctl...destradaa2014-04-251-2/+2
|/
* Camera2 API: fix bug in Camera2 CTS test failure.Jianing Wei2014-04-181-4/+23
* Merge "Camera2 API: fix wrong logic in handling last frame number."Jianing Wei2014-04-182-35/+120
|\
| * Camera2 API: fix wrong logic in handling last frame number.Jianing Wei2014-04-172-35/+120
* | am 18a69b93: am 8e1e4006: Merge "Add support for dynamically setting the virt...Jeff Brown2014-04-174-10/+59
|\ \
| * \ am 8e1e4006: Merge "Add support for dynamically setting the virtual display s...Jeff Brown2014-04-174-10/+59
| |\ \
| | * | Add support for dynamically setting the virtual display surface.Jeff Brown2014-04-164-10/+59
* | | | Camera2: Update sync.frameNumber tagZhijun He2014-04-171-2/+2
* | | | Merge "Update DNG tags."Ruben Brunk2014-04-163-175/+301
|\ \ \ \
| * | | | Update DNG tags.Ruben Brunk2014-04-163-175/+301
* | | | | Rename basePkg to opPkgChristoph Studer2014-04-161-2/+2
| |_|_|/ |/| | |
* | | | am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to Se...Aravind Akella2014-04-111-8/+200
|\ \ \ \ | | |/ / | |/| |
| * | | am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.j...Aravind Akella2014-04-111-8/+200
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Add stringType and requiredPermissions to SensorManager.java, as well ...Aravind Akella2014-04-111-8/+200
| | |\ \
| | | * | Add stringType and requiredPermissions to SensorManager.java, as well as a pe...Aravind Akella2014-04-111-8/+200
* | | | | am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiC...Jinsuk Kim2014-04-112-2/+17
|\ \ \ \ \ | |/ / / /
| * | | | am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subc...Jinsuk Kim2014-04-112-2/+17
| |\ \ \ \ | | |/ / /
| | * | | Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into kl...Jinsuk Kim2014-04-112-2/+17
| | |\ \ \
| | | * | | Delegate HdmiCecService method impl to HdmiCecDevice subclassJinsuk Kim2014-04-112-2/+17
| | | |/ /
* | | | | resolved conflicts for merge of 337e764d to masterJeff Brown2014-04-112-16/+10
|\ \ \ \ \ | |/ / / /
| * | | | am f24687e2: Merge "Plumb display power state through display manager." into ...Jeff Brown2014-04-112-16/+10
| |\ \ \ \ | | |/ / /
| | * | | Plumb display power state through display manager.Jeff Brown2014-04-102-16/+10
| * | | | am ea72cdf2: Merge "Move display power controller to display manager service....Jeff Brown2014-04-091-0/+164
| |\ \ \ \ | | |/ / /
| | * | | Move display power controller to display manager service. (DO NOT MERGE)Jeff Brown2014-04-081-0/+164
| | |/ /
| * | | am 819239e5: Revert "Add stringType and requiredPermissions to SensorManager....Etienne Le Grand2014-04-051-200/+8
| |\ \ \ | | |/ /
| | * | Revert "Add stringType and requiredPermissions to SensorManager.java, as well...Etienne Le Grand2014-04-051-200/+8
* | | | Merge "Camera2 API: enable burst capture and repeating burst."Jianing Wei2014-04-107-63/+444
|\ \ \ \ | |_|_|/ |/| | |
| * | | Camera2 API: enable burst capture and repeating burst.Jianing Wei2014-04-107-63/+444
* | | | Camera2: Add MANUAL capture intentZhijun He2014-04-092-2/+18
* | | | Camera2: Fix the JPEG format issuesZhijun He2014-04-091-0/+92
* | | | Merge "Move display power controller to display manager service."Jeff Brown2014-04-091-0/+164
|\ \ \ \
| * | | | Move display power controller to display manager service.Jeff Brown2014-04-081-0/+164
| |/ / /
* | | | Camera2: Make colorFilterArrangement publicZhijun He2014-04-092-0/+45
|/ / /
* | | Revert "Add stringType and requiredPermissions to SensorManager.java, as well...Etienne Le Grand2014-04-051-200/+8
* | | am bdfe3841: am fd53d835: Add stringType and requiredPermissions to SensorMan...Etienne Le Grand2014-04-051-8/+200
|\ \ \ | |/ /
| * | am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as...Etienne Le Grand2014-04-051-8/+200
| |\ \ | | |/
| | * Add stringType and requiredPermissions to SensorManager.java, as well as a pe...Etienne Le Grand2014-04-041-8/+200
* | | am f2fe3505: am 31518f74: Merge "Use build property for CEC device OSD name" ...Jinsuk Kim2014-04-031-1/+0
|\ \ \ | |/ /
| * | am 31518f74: Merge "Use build property for CEC device OSD name" into klp-modu...Jinsuk Kim2014-04-031-1/+0
| |\ \ | | |/
| | * Use build property for CEC device OSD nameJinsuk Kim2014-04-031-1/+0
* | | am 4c963841: am b1dca162: Merge "Maintain display power status for playback d...Jinsuk Kim2014-04-034-7/+20
|\ \ \ | |/ /
| * | am b1dca162: Merge "Maintain display power status for playback device" into k...Jinsuk Kim2014-04-024-7/+20
| |\ \ | | |/
| | * Merge "Maintain display power status for playback device" into klp-modular-devJinsuk Kim2014-04-024-7/+20
| | |\
| | | * Maintain display power status for playback deviceJinsuk Kim2014-04-024-7/+20
| * | | am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setPa...Eino-Ville Talvala2014-03-251-4/+26
| |\ \ \ | | |/ /
| | * | am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for ...Eino-Ville Talvala2014-03-251-4/+26
| | |\ \ | | | |/ | | |/|