summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MediaCodec: move to UNINITIALIZED state on codec errorLajos Molnar2014-03-311-0/+2
* ACodec: ignore OMX messages to already freed componentLajos Molnar2014-03-281-0/+8
* mediaplayer: add temporary developer settings to use NuPlayer as defaultLajos Molnar2014-03-281-0/+6
* Merge "Mark the logging heap read-only to media.log service"Glenn Kasten2014-03-281-1/+1
|\
| * Mark the logging heap read-only to media.log serviceGlenn Kasten2014-03-181-1/+1
* | am 4f1ef2cd: (-s ours) am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert ...Lajos Molnar2014-03-280-0/+0
|\ \
| * \ am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more...Lajos Molnar2014-03-283-56/+30
| |\ \
| | * \ am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with...Lajos Molnar2014-03-283-56/+30
| | |\ \
| | | * \ Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQu...Lajos Molnar2014-03-283-56/+30
| | | |\ \
| | | | * | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-273-56/+30
* | | | | | am ff382d0c: (-s ours) am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert ...Lajos Molnar2014-03-280-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for...Lajos Molnar2014-03-282-10/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeue...Lajos Molnar2014-03-282-10/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be o...Lajos Molnar2014-03-282-10/+7
| | | |\ \ \ | | | | |/ /
| | | | * | DO NOT MERGE: Revert "stagefright: allow for minUndequeuedBufs to be one less"Lajos Molnar2014-03-272-10/+7
* | | | | | CameraMetadata: Fix String tag update null character issueZhijun He2014-03-271-1/+2
* | | | | | Merge "Camera3: fix HAL3.x version check issue"Zhijun He2014-03-275-5/+17
|\ \ \ \ \ \
| * | | | | | Camera3: fix HAL3.x version check issueZhijun He2014-03-275-5/+17
* | | | | | | Fix the buildEric Laurent2014-03-262-5/+5
* | | | | | | Merge "audio policy: remove obsolete AudioPolicyManager class members"Eric Laurent2014-03-272-38/+0
|\ \ \ \ \ \ \
| * | | | | | | audio policy: remove obsolete AudioPolicyManager class membersEric Laurent2014-03-262-38/+0
* | | | | | | | Merge "audio policy: use new audio device representation"Eric Laurent2014-03-272-281/+549
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | audio policy: use new audio device representationEric Laurent2014-03-262-281/+549
* | | | | | | | Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>"Glenn Kasten2014-03-266-29/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>Glenn Kasten2014-03-266-29/+30
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Use LOG_ALWAYS_FATAL instead of LOG_FATAL"Glenn Kasten2014-03-266-19/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Use LOG_ALWAYS_FATAL instead of LOG_FATALGlenn Kasten2014-03-266-19/+19
* | | | | | | | | Update commentsGlenn Kasten2014-03-267-13/+11
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge "Use symbolic constants from <system/audio.h>"Glenn Kasten2014-03-265-14/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | Use symbolic constants from <system/audio.h>Glenn Kasten2014-03-255-14/+9
| |/ / / / / / /
* | | | | | | | Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"Glenn Kasten2014-03-263-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Use symbol AUDIO_DEVICE_NONE from <system/audio.h>Glenn Kasten2014-03-253-5/+5
| |/ / / / / / /
* | | | | | | | Merge "Remove stream type from AudioSystem::getRenderPosition()"Glenn Kasten2014-03-262-13/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove stream type from AudioSystem::getRenderPosition()Glenn Kasten2014-03-262-13/+3
| |/ / / / / / /
* | | | | | | | Merge "Use symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>"Glenn Kasten2014-03-261-5/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Use symbol AUDIO_SESSION_OUTPUT_MIX from <system/audio.h>Glenn Kasten2014-03-261-5/+6
| |/ / / / / / /
* | | | | | | | Merge "Fix uses of KeyedVector"Glenn Kasten2014-03-263-3/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix uses of KeyedVectorGlenn Kasten2014-03-253-3/+2
| |/ / / / / / /
* | | | | | | | Merge "Remove streamType parameter from AudioSystem::getLatency()"Glenn Kasten2014-03-263-5/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove streamType parameter from AudioSystem::getLatency()Glenn Kasten2014-03-253-5/+3
| |/ / / / / / /
* | | | | | | | Merge "Remove dead code"Glenn Kasten2014-03-261-20/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove dead codeGlenn Kasten2014-03-261-20/+0
| |/ / / / / / /
* | | | | | | | Merge "Fix log spam when MonoPipe is unable to get local frequency"Glenn Kasten2014-03-261-6/+22
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix log spam when MonoPipe is unable to get local frequencyGlenn Kasten2014-03-251-6/+22
| |/ / / / / / /
* | | | | | | | Merge "Revert "camera: Fix setParameters for Preview FPS single/range values""Eino-Ville Talvala2014-03-263-267/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "camera: Fix setParameters for Preview FPS single/range values"Eino-Ville Talvala2014-03-263-267/+47
* | | | | | | | | Merge "Document AudioSystem::newAudioSessionId() failures"Glenn Kasten2014-03-263-2/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Document AudioSystem::newAudioSessionId() failuresGlenn Kasten2014-03-253-2/+8
| |/ / / / / / /
* | | | | | | | Merge "Document AudioFlinger::nextUniqueId()"Glenn Kasten2014-03-262-2/+13
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Document AudioFlinger::nextUniqueId()Glenn Kasten2014-03-252-2/+13
| |/ / / / / /