summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 098b28fc: am 64727dd7: Merge "More precise 32-bit only for libstagefright/...Glenn Kasten2014-03-185-0/+10
|\
| * am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"Glenn Kasten2014-03-185-0/+10
| |\
| | * Merge "More precise 32-bit only for libstagefright/ subdirectories"Glenn Kasten2014-03-185-0/+10
| | |\
| | | * More precise 32-bit only for libstagefright/ subdirectoriesGlenn Kasten2014-03-175-0/+10
| | |/
* | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-187-21/+36
|\ \ \
| * | | Remove deprecated BufferQueue constructorDan Stoza2014-03-127-21/+36
* | | | Merge "audio policy: renamed AudioPolicyManagerBase to AudioPolicyManager"Eric Laurent2014-03-182-158/+153
|\ \ \ \
| * | | | audio policy: renamed AudioPolicyManagerBase to AudioPolicyManagerEric Laurent2014-03-112-158/+153
* | | | | Merge "audio policy: remove dependency from AudioSystemLegacy"Eric Laurent2014-03-183-243/+252
|\ \ \ \ \ | |/ / / /
| * | | | audio policy: remove dependency from AudioSystemLegacyEric Laurent2014-03-113-243/+252
* | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-181-3/+5
|\ \ \ \ \
| * | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-3/+5
| | |/ / / | |/| | |
* | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-184-14/+13
|\ \ \ \ \
| * | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-124-14/+13
* | | | | | Merge "audio policy: import audio policy manager from hardware legacy"Eric Laurent2014-03-183-0/+4939
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | audio policy: import audio policy manager from hardware legacyEric Laurent2014-03-113-0/+4939
* | | | | | Merge "audio policy: split implementation"Eric Laurent2014-03-184-642/+784
|\ \ \ \ \ \ | |/ / / / /
| * | | | | audio policy: split implementationEric Laurent2014-03-114-642/+784
* | | | | | am 557847ee: am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null ...Igor Murashkin2014-03-181-0/+10
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null availability ...Igor Murashkin2014-03-181-0/+10
| |\ \ \ \ \
| | * \ \ \ \ am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | |\ \ \ \ \
| | | * | | | | camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
* | | | | | | | Merge "move audio policy service to a separate library"Eric Laurent2014-03-186-3/+47
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | move audio policy service to a separate libraryEric Laurent2014-03-116-3/+47
* | | | | | | | am 9a9481f8: am 0e7e5db7: Merge "More 32-bit only"Glenn Kasten2014-03-171-0/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 0e7e5db7: Merge "More 32-bit only"Glenn Kasten2014-03-171-0/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge "More 32-bit only"Glenn Kasten2014-03-171-0/+2
| | |\ \ \ \ \ \
| | | * | | | | | More 32-bit onlyGlenn Kasten2014-03-141-0/+2
| | |/ / / / / /
* | | | | | | | camera3: Remove old vendor tag ops dependencies.Ruben Brunk2014-03-172-15/+0
* | | | | | | | camera2: Don't log vendor tag errors when camera HAL too oldIgor Murashkin2014-03-175-11/+17
* | | | | | | | Merge "Make error handling more similar for output and capture"Glenn Kasten2014-03-152-40/+43
|\ \ \ \ \ \ \ \
| * | | | | | | | Make error handling more similar for output and captureGlenn Kasten2014-03-142-40/+43
* | | | | | | | | am 0dc35830: (-s ours) am 8788c40c: am 75dcf510: Merge "Verify certificates" ...Marco Nelissen2014-03-150-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | am 8788c40c: am 75dcf510: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am 75dcf510: Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge "Verify certificates" into klp-devMarco Nelissen2014-03-142-1/+101
| | | |\ \ \ \ \
| | | | * | | | | Verify certificatesMarco Nelissen2014-03-132-1/+101
* | | | | | | | | Make error handling for audio driver initCheck more similarGlenn Kasten2014-03-141-8/+6
* | | | | | | | | Make session ID code similar between output and captureGlenn Kasten2014-03-141-5/+5
* | | | | | | | | Move declarations to where neededGlenn Kasten2014-03-141-5/+2
* | | | | | | | | Remove name output parameter from createTrackGlenn Kasten2014-03-146-18/+2
* | | | | | | | | Replace if/else by switchGlenn Kasten2014-03-141-3/+11
* | | | | | | | | Whitespace and commentsGlenn Kasten2014-03-143-5/+4
* | | | | | | | | Prepare for additional capture formatsGlenn Kasten2014-03-141-3/+3
* | | | | | | | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-1413-0/+36
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-1414-0/+38
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-1414-0/+38
| | |\ \ \ \ \ \ \
| | | * | | | | | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-1214-0/+38
* | | | | | | | | | am f1ac623f: am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"Andreas Huber2014-03-141-11/+22
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /