summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'f9e3022c474619c69a46ae7dbe11b5b531dbad57' into am-0d58d39a-0539...cm-11.0Emilian Peev2018-07-171-2/+2
* Camera metadata: Check source metadata sizeEmilian Peev2018-01-141-0/+6
* Fix potential overflow in Visualizer effectrago2016-11-201-0/+1
* Camera metadata: Check for inconsistent data countEino-Ville Talvala2016-10-211-0/+13
* Camera: Prevent data size overflowChien-Yu Chen2016-10-211-14/+43
* Merge tag 'android-4.4.3_r1' into HEADcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0Ricardo Cerqueira2014-06-030-0/+0
|\
| * audio_route: fix crash with unsupported control typesEric Laurent2014-03-061-17/+60
* | audio_route: Add APIs to update mixer based on pathcm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eaHaynes Mathew George2014-05-062-0/+77
* | audio_route: fix crash with unsupported control typesEric Laurent2014-02-111-17/+60
* | Revert "audio_route: fix possible segfault"elektroschmock2014-02-111-18/+0
* | Merge tag 'android-4.4.1_r1' into HEADRicardo Cerqueira2013-12-064-3/+207
|\|
| * Camera: Make partialResult quirk fields hidden, not system.Eino-Ville Talvala2013-11-073-6/+6
| * Camera: Add partialResult quirk metadata fieldsEino-Ville Talvala2013-11-054-3/+207
| * merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\
* | | audio_route: fix possible segfaultEthan Chen2013-11-221-0/+18
* | | Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-0133-1648/+4988
|\ \ \ | | |/ | |/|
| * | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-100-0/+0
| |\ \ | | |/ | |/|
| | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-080-0/+0
| | |\
| | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | | |\
| | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-10-010-0/+0
| | | | |\
| | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-290-0/+0
| | | | | |\
| | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-260-0/+0
| | | | | | |\
| | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-240-0/+0
| | | | | | | |\
| | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-230-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in klp-release history after reset to klp-devThe Android Automerger2013-09-220-0/+0
| | | | | | | | | |\
| * | | | | | | | | | camera_metadata: Add CaptureResult cts testZhijun He2013-10-093-1/+46
| * | | | | | | | | | merge in KFS78N (no-op)Ed Heyl2013-10-080-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merge in klp-factoryrom-release history after reset to klp-releaseThe Android Automerger2013-09-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ merge in KQS81MEd Heyl2013-10-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| | * | | | | | | | | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-09-170-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| * | | | | | | | | | | | Merge "camera_metadata: add non-full hw level optional tag" into klp-devAlex Ray2013-10-078-13/+90
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | camera_metadata: add non-full hw level optional tagAlex Ray2013-10-028-13/+90
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| * / | | | | | | | | | camera_metadata: make face score range 1-100Zhijun He2013-10-022-2/+2
| |/ / / / / / / / / /
| * | | | | / / / / / camera_metadata: Update CameraCharactericsTest to check #getKeys()Igor Murashkin2013-09-301-0/+11
| | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | camera_metadata: Fix focusRange definitionZhijun He2013-09-263-2/+12
| | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge "camera_metadata: Update CameraCharacteristicsTest" into klp-devZhijun He2013-09-261-21/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | camera_metadata: Update CameraCharacteristicsTestZhijun He2013-09-251-21/+2
| | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Merge "Camera: Add PASSIVE_UNFOCUSED AF state" into klp-devEino-Ville Talvala2013-09-254-10/+25
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Camera: Add PASSIVE_UNFOCUSED AF stateEino-Ville Talvala2013-09-204-10/+25
| | |/ / / / / /
| * | | | | | | Merge "Visualizer header update for level monitoring" into klp-devJean-Michel Trivi2013-09-231-0/+11
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Visualizer header update for level monitoringJean-Michel Trivi2013-09-231-0/+11
| * | | | | | | camera_metadata: Rename CameraProperties to CameraCharacteristicsIgor Murashkin2013-09-215-16/+19
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | camera_metadata: Update android.request.frameCount docsIgor Murashkin2013-09-202-6/+14
| |/ / / / /
| * / / / / camera2: Update api to be asyncIgor Murashkin2013-09-191-1/+11
| |/ / / /
| * | / / camera_metadata: doc fix for availableProcessedSizesZhijun He2013-09-172-0/+14
| | |/ / | |/| |
| * | | Audio effect header for loudness enhancementJean-Michel Trivi2013-09-161-0/+45
| |/ /
| * | Merge "Camera: Fix Java metadata generation bug" into klp-devEino-Ville Talvala2013-09-121-4/+3
| |\ \
| | * | Camera: Fix Java metadata generation bugEino-Ville Talvala2013-09-121-4/+3
| | |/
| * | Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-devIgor Murashkin2013-09-124-0/+9
| |\ \ | | |/ | |/|