summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* audio policy: acquire lock for volume functionsEric Laurent2012-06-191-1/+3
* am ff8977f3: Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\
| * Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
| |\
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-160-0/+0
| | |\
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-140-0/+0
| | | |\
| | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-120-0/+0
| | | | | |\
* | | | | | \ Merge "libstagefright: dynamically load libstagefright_chromium_http"Colin Cross2012-06-187-12/+170
|\ \ \ \ \ \ \
| * | | | | | | libstagefright: dynamically load libstagefright_chromium_httpColin Cross2012-06-157-12/+170
* | | | | | | | am 4862d1ea: am eb15716b: Change definition of warmup periodGlenn Kasten2012-06-181-2/+5
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am eb15716b: Change definition of warmup periodGlenn Kasten2012-06-181-2/+5
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Change definition of warmup periodGlenn Kasten2012-06-151-2/+5
* | | | | | | | am 16f07fb7: am 972af221: FastMixer compensates for SRC jitter in audio HALGlenn Kasten2012-06-181-6/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 972af221: FastMixer compensates for SRC jitter in audio HALGlenn Kasten2012-06-181-6/+14
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | FastMixer compensates for SRC jitter in audio HALGlenn Kasten2012-06-151-6/+14
* | | | | | | | Camera2: Move per-frame verbose logs to separate log enableEino-Ville Talvala2012-06-181-7/+14
* | | | | | | | Merge "Camera2: Handle preview orientation changes."Eino-Ville Talvala2012-06-184-3/+101
|\ \ \ \ \ \ \ \
| * | | | | | | | Camera2: Handle preview orientation changes.Eino-Ville Talvala2012-06-154-3/+101
* | | | | | | | | Merge "Camera2: Connect camera parameters to HAL request entries."Eino-Ville Talvala2012-06-182-66/+426
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Camera2: Connect camera parameters to HAL request entries.Eino-Ville Talvala2012-06-152-66/+426
* | | | | | | | | Merge "Camera2: Minor parameter restructuring"Eino-Ville Talvala2012-06-152-51/+60
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Camera2: Minor parameter restructuringEino-Ville Talvala2012-06-152-51/+60
* | | | | | | | | am fbb26f51: am fc42e16d: Merge "Fix track selection code in AwesomePlayer" i...James Dong2012-06-151-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-devJames Dong2012-06-151-1/+1
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge "Fix track selection code in AwesomePlayer" into jb-devJames Dong2012-06-151-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix track selection code in AwesomePlayerInsun Kang2012-06-151-1/+1
* | | | | | | | | | am ff0fcb26: am 0a14c4ce: Make CPU frequency statistics optionalGlenn Kasten2012-06-153-4/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 0a14c4ce: Make CPU frequency statistics optionalGlenn Kasten2012-06-153-4/+24
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Make CPU frequency statistics optionalGlenn Kasten2012-06-143-4/+24
| | |/ / / / / / /
* | | | | | | | | am 59b9dffe: (-s ours) am 362ebcbf: DO NOT MERGE Remove log spam for fast tra...Glenn Kasten2012-06-140-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | am 362ebcbf: DO NOT MERGE Remove log spam for fast track deniedGlenn Kasten2012-06-141-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | DO NOT MERGE Remove log spam for fast track deniedGlenn Kasten2012-06-141-1/+1
* | | | | | | | am be8cf4a2: am 7b4de101: Merge "stagefright: set scaling mode for blank fram...Jamie Gennis2012-06-141-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-devJamie Gennis2012-06-141-0/+8
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "stagefright: set scaling mode for blank frames" into jb-devJamie Gennis2012-06-141-0/+8
| | |\ \ \ \ \ \
| | | * | | | | | stagefright: set scaling mode for blank framesJamie Gennis2012-06-141-0/+8
* | | | | | | | | am 4ebbabda: am 192cbbad: Fix audio track pause.Eric Laurent2012-06-141-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | am 192cbbad: Fix audio track pause.Eric Laurent2012-06-141-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Fix audio track pause.Eric Laurent2012-06-141-0/+1
| | |/ / / / /
* | | | | | | Camera2: Add more dump information, connect HAL device dumpEino-Ville Talvala2012-06-143-29/+188
* | | | | | | am c3c044ab: am 82233b4b: Merge "Better handle invalid duration in Xing/VBRI ...Marco Nelissen2012-06-142-7/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 82233b4b: Merge "Better handle invalid duration in Xing/VBRI tags" into jb...Marco Nelissen2012-06-142-7/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Better handle invalid duration in Xing/VBRI tags" into jb-devMarco Nelissen2012-06-142-7/+16
| | |\ \ \ \ \
| | | * | | | | Better handle invalid duration in Xing/VBRI tagsMarco Nelissen2012-06-132-7/+16
| | | | |/ / / | | | |/| | |
* | | | | | | am ea1d16da: am e6adde40: Merge "Shorten dumpsys media.audio_flinger output" ...Glenn Kasten2012-06-141-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e6adde40: Merge "Shorten dumpsys media.audio_flinger output" into jb-devGlenn Kasten2012-06-141-0/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Shorten dumpsys media.audio_flinger output" into jb-devGlenn Kasten2012-06-141-0/+4
| | |\ \ \ \ \
| | | * | | | | Shorten dumpsys media.audio_flinger outputGlenn Kasten2012-06-131-0/+4
| | | |/ / / /
* | | | | | | am 48a0bfa6: am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warni...Glenn Kasten2012-06-143-6/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warnings" into jb-devGlenn Kasten2012-06-143-6/+6
| |\ \ \ \ \ \ | | |/ / / / /