summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ | | | | | | Android 4.4.3 release 1
| * audio_route: fix crash with unsupported control typesEric Laurent2014-03-061-17/+60
| | | | | | | | | | | | | | | | | | | | Check if control type is supported before accessing xxx_value fields in mixer_state structure. Also remove unused parameter warning. Bug: 12871072. Change-Id: I64c7d5e16728e3502f1fcd0a40658b72ec7acbe7
* | 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_apply_and_update_path audio_route_reset_and_update_path These routines allows updating the mixer controls for just the specified path. The controls will be updated in the order listed in the XML file. Change-Id: If193bc047ccbb8c6497926d6181c5c4541a9d6aa CRs-Fixed: 581453
* | audio_route: fix crash with unsupported control typesEric Laurent2014-02-111-17/+60
| | | | | | | | | | | | | | | | | | Check if control type is supported before accessing xxx_value fields in mixer_state structure. Also remove unused parameter warning. Change-Id: I9005d4760e55f0798d576bd4507700e198900311
* | Revert "audio_route: fix possible segfault"elektroschmock2014-02-111-18/+0
| | | | | | | | | | | | This reverts commit 84f0b1899302784c679105f444e87686a66c1274. Change-Id: I35c375d7b8291eca166267f621f6ef4d4b870a1c
* | Merge tag 'android-4.4.1_r1' into HEADRicardo Cerqueira2013-12-064-3/+207
|\| | | | | | | Android 4.4.1 Release 1
| * Camera: Make partialResult quirk fields hidden, not system.Eino-Ville Talvala2013-11-073-6/+6
| | | | | | | | | | Bug: 11115603 Change-Id: I39c51f0a7655736ff216143ece951102930af93c
| * Camera: Add partialResult quirk metadata fieldsEino-Ville Talvala2013-11-054-3/+207
| | | | | | | | | | | | | | | | | | To be used by HALs to split up capture results into multiple batches. Bug: 11115603 Change-Id: I5cfc26b2812f9bf4613944c0679e0e29cfd43616
| * merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\
* | | audio_route: fix possible segfaultEthan Chen2013-11-221-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Mixers may not allocate memory to save their values if the type is not of bool, enum, or int. However we do not check the type when actually attempting to use the allocated memory, resulting in possibly writing into random memory. Change-Id: I8e59c8e6211b7ea10bd128069378632e0ced27a5
* | | Merge tag 'android-4.4_r1' into cm-11.0Ricardo Cerqueira2013-11-0133-1648/+4988
|\ \ \ | | |/ | |/| | | | Android 4.4 Release 1.0
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the new line from CameraMetadataKeys.mako to avoid adding new line to the generated file every time we run the script. Bug: 11082745 Change-Id: I6bed9a71463d866adfe4178e00c33df7b9158ab8
| * | | | | | | | | | 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
| | | |_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10838063 Change-Id: If6d1ef5bd58aca3a9a722e4317f5ce6804dd6680
| * / | | | | | | | | | camera_metadata: make face score range 1-100Zhijun He2013-10-022-2/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1-100 is what we specified in API side. Bug: 10406212 Change-Id: Id0180dc44b95c43ad820a307d9e3bd98b8fd74fb
| * | | | | / / / / / camera_metadata: Update CameraCharactericsTest to check #getKeys()Igor Murashkin2013-09-301-0/+11
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11007040 Change-Id: If934f861db61cd23af029104d8120a08e52a27ae
| * | | | | | | | | camera_metadata: Fix focusRange definitionZhijun He2013-09-263-2/+12
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should be a pair of floats. Bug: 10360518 Change-Id: Ia24741ce9bcae4473eee8be0adc3a190efeab0b8
| * | | | | | | | Merge "camera_metadata: Update CameraCharacteristicsTest" into klp-devZhijun He2013-09-261-21/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | camera_metadata: Update CameraCharacteristicsTestZhijun He2013-09-251-21/+2
| | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace CameraDevice#getProperties with CameraManager#getCameraCharacteristics. Bug: 10360518 Change-Id: Id79ee8d984b79ed43bccf77bb571eb6d788e1a1a
| * | | | | | | | 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
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10860639 Change-Id: I967b207f8e0473d590fecab942b39dbbb04d0186
| * | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Definition and command for measurement mode, and performing a measurement Bug 8413913 Change-Id: Id4e3cc6be89f6f706adb933fe14e3df7241236a9
| * | | | | | | camera_metadata: Rename CameraProperties to CameraCharacteristicsIgor Murashkin2013-09-215-16/+19
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10360518 Change-Id: Ib152a751fed07250c8f211b25469560ef05f1107
| * | | | | | camera_metadata: Update android.request.frameCount docsIgor Murashkin2013-09-202-6/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10360518 Change-Id: Ia8601df787d166f07264ab0c19ca78e4412574c1
| * / / / / camera2: Update api to be asyncIgor Murashkin2013-09-191-1/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 10360518 Change-Id: I66b0dc54135a85822a218e1259dd171e7ddf0c87
| * | / / camera_metadata: doc fix for availableProcessedSizesZhijun He2013-09-172-0/+14
| | |/ / | |/| | | | | | | | | | | | | | Bug: 10745982 Change-Id: I2d5aa9a384fa3107482fcf67bef7c1afbd60c50c
| * | | Audio effect header for loudness enhancementJean-Michel Trivi2013-09-161-0/+45
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Not defined in OpenSL ES. Single parameter: target gain, in mB Bug 8413913 Change-Id: I088009b7471b21502cbeb84a668ebe3484aaea84
| * | 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
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a single section included multiple groups of metadata of the same kind (control, static, or dynamic), only the first was being used for generating Java-level keys and enums. Specifically, this affected android.statistics.lensShadingMapMode Bug: 10726421 Change-Id: Ibec159777dee4d89cf04a7e2a450d4675934636f
| * | Merge "camera_metadata: add android.lens.state MOVING enum value" into klp-devIgor Murashkin2013-09-124-0/+9
| |\ \ | | |/ | |/|
| | * camera_metadata: add android.lens.state MOVING enum valueIgor Murashkin2013-09-114-0/+9
| | | | | | | | | | | | | | | Bug: 10621609 Change-Id: Ie5533dfa846df3d4935dcdc58ecc0ce4bcda1914
| * | Camera: Updates for latest camera2 API changesEino-Ville Talvala2013-09-101-1/+1
| |/ | | | | | | | | Bug: 10549462 Change-Id: Ic8d24d5288a2da8c9e804293be7b4043be038e05
| * Merge "camera_metadata: Correct stream id type" into klp-devZhijun He2013-09-094-9/+9
| |\
| | * camera_metadata: Correct stream id typeZhijun He2013-09-064-9/+9
| | | | | | | | | | | | | | | | | | | | | It was wrongly specified as uint8_t. Bug: 10604704 Change-Id: I1cbe2862f49135ddc600e9c05c6f1dda6d28070c
| * | Merge "Camera: Add operations to enumerate vendor tags" into klp-devAlexander Ray2013-09-072-1/+47
| |\ \