summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-24212-51205/+1661
|\
| * move emulator HALs to device/generic/goldfishkeunyoung2013-03-11192-51210/+0
| * am f39c1088: am 7b9e308b: Merge ""debug" in those modules is discouraged"Ying Wang2013-03-0711-54/+4
| |\
| | * "debug" in those modules is discouragedYing Wang2013-03-0111-54/+4
| | * EmulatedCamera2: Fix metadata symbols: DO NOT MERGEIgor Murashkin2013-01-302-174/+146
| | * Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE"...Igor Murashkin2013-01-302-33/+0
| | * Camera2: Fix segfault when control fields were omitted in metadata: DO NOT MERGEIgor Murashkin2013-01-101-6/+17
| | * Camera2: Test: fix deadlock in isStreamInUse: DO NOT MERGEIgor Murashkin2013-01-101-1/+2
| | * Camera2: Return -ENODEV for camera indices out of bounds: DO NOT MERGEIgor Murashkin2013-01-101-2/+2
| | * Camera2: Turn off 3A when android.control.mode == OFF: DO NOT MERGEIgor Murashkin2013-01-101-0/+16
| | * Camera2: Fix a potential race condition in the readout thread: DO NOT MERGEIgor Murashkin2013-01-101-0/+1
| | * Camera2: Fix a deadlock when closing the camera: DO NOT MERGEIgor Murashkin2013-01-101-12/+16
| | * Camera2: Selectively re-define master metadata symbols: DO NOT MERGEIgor Murashkin2013-01-102-0/+33
| * | Merge "Fix glShaderSource parameter constness"Jesse Hall2013-02-235-221/+221
| |\ \
| | * | Fix glShaderSource parameter constnessJesse Hall2013-02-155-221/+221
| * | | Make software vp8 video encoder available to MediaCodec on emulatorJames Dong2013-02-131-0/+1
| |/ /
| * | clean-up sensor emulation code.Mathias Agopian2013-02-061-3/+2
| * | Camera2: Fix segfault when control fields were omitted in metadataIgor Murashkin2012-12-201-6/+17
| * | Camera2: Test: fix deadlock in isStreamInUseIgor Murashkin2012-12-201-1/+2
| * | Camera2: Return -ENODEV for camera indices out of boundsIgor Murashkin2012-12-201-2/+2
| * | Merge "Camera2: Turn off 3A when android.control.mode == OFF"Igor Murashkin2012-12-181-0/+16
| |\ \
| | * | Camera2: Turn off 3A when android.control.mode == OFFIgor Murashkin2012-12-141-0/+16
| * | | Merge "Revert "Camera2: Fix a potential race condition in the readout thread""Igor Murashkin2012-12-181-1/+0
| |\| |
| | * | Revert "Camera2: Fix a potential race condition in the readout thread"Igor Murashkin2012-12-141-1/+0
| * | | Merge "Camera2: Fix a potential race condition in the readout thread"Igor Murashkin2012-12-121-0/+1
| |\| |
| | * | Camera2: Fix a potential race condition in the readout threadIgor Murashkin2012-12-071-0/+1
| * | | Merge "Camera2: Fix a deadlock when closing the camera"Igor Murashkin2012-12-121-12/+16
| |\| |
| | * | Camera2: Fix a deadlock when closing the cameraIgor Murashkin2012-12-071-12/+16
| * | | Merge "EmulatedCamera2: Fix metadata symbols"Igor Murashkin2012-12-042-174/+146
| |\| |
| | * | EmulatedCamera2: Fix metadata symbolsIgor Murashkin2012-11-302-174/+146
| * | | Add gsm decoder to media codec listMarco Nelissen2012-11-161-0/+1
| |/ /
| * | am f7e5b78d: am 72452858: am 91d9d51f: Return accuracy in GPS emulationLaurent Tu2012-10-121-0/+14
| |\|
| * | am 0eedcba2: am 6b03c84e: Use more secure exponent for generating keysBaligh Uddin2012-09-281-1/+1
| |\ \
| * \ \ am c7501c25: am c31f70a3: center text, fix extents for multiline textsDoug Zongker2012-09-182-5/+45
| |\ \ \
| * \ \ \ am 87914ead: am 608a5afb: update the localizer tool to use all available tran...Doug Zongker2012-09-181-8/+19
| |\ \ \ \
| * \ \ \ \ am 7adaeb6e: am d6046a44: EmulatedFakeCamera2: Add shim to work around FORMAT...Eino-Ville Talvala2012-09-171-0/+5
| |\ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-1448-8/+383
| * | | | | | am 87ae2ac8: am cfd8132a: Merge "EmulatedFakeCamera2: Split AE/AWB mode and l...Eino-Ville Talvala2012-09-062-15/+33
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am dfe8cfa1: am 7002083f: Merge "Revert "Revert "EmulatedFakeCamera2: Add pre...Eino-Ville Talvala2012-09-047-171/+700
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess sup...Eino-Ville Talvala2012-09-047-171/+700
| * | | | | | | | am ea7a061c: am f8ddf2e5: Merge "Revert "Revert "Gralloc: Support HW_CAMERA_R...Eino-Ville Talvala2012-09-041-4/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Revert "Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage.""Eino-Ville Talvala2012-09-041-4/+10
| * | | | | | | | | am 7e2ae6af: am f0063b29: Merge "Revert "Gralloc: Support HW_CAMERA_READ/HW_C...Eino-Ville Talvala2012-09-041-10/+4
| |\| | | | | | | |
| | * | | | | | | | Revert "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZSL usage."Eino-Ville Talvala2012-09-041-10/+4
| * | | | | | | | | am 3cb39916: am 7b8420e2: Merge "Revert "EmulatedFakeCamera2: Add precapture ...Eino-Ville Talvala2012-09-047-700/+171
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Revert "EmulatedFakeCamera2: Add precapture trigger and reprocess support"Eino-Ville Talvala2012-09-047-700/+171
| * | | | | | | | | am 9468d306: am c07123b1: Merge "EmulatedFakeCamera2: Add precapture trigger ...Eino-Ville Talvala2012-09-047-171/+700
| |\| | | | | | | |
| * | | | | | | | | am 28125f96: am 4604e30d: Merge "Gralloc: Support HW_CAMERA_READ/HW_CAMERA_ZS...Eino-Ville Talvala2012-09-041-4/+10
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | am 2cb5c238: am cbb1d726: Merge "EmulatedFakeCamera2: Use HAL_PIXEL_FORMAT_IM...Eino-Ville Talvala2012-08-303-23/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 0999f50b: am adf05af0: Merge "add an app to generate localized text bitmap...Doug Zongker2012-08-296-0/+372
| |\ \ \ \ \ \ \ \ \ \