summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add support for HLS playlists of type 'event'.Andreas Huber2012-11-2723-46/+276
* Merge "New VHQ resampler" into jb-mr1.1-devGlenn Kasten2012-11-2711-4818/+1427
|\
| * New VHQ resamplerGlenn Kasten2012-11-2711-4818/+1427
* | Camera: Play shutter sound iff enableShutterSound(true) && ShutterCallback !nullIgor Murashkin2012-11-263-9/+14
|/
* Static AudioTrack plays twice initiallyGlenn Kasten2012-11-161-1/+1
* Merge "Properly signal an error if codec configuration goes wrong." into jb-m...Andreas Huber2012-11-141-1/+6
|\
| * Properly signal an error if codec configuration goes wrong.Andreas Huber2012-11-141-1/+6
* | Various improvements of wifi display codeAndreas Huber2012-11-1316-302/+633
|/
*-. Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-11-010-0/+0
| | |\
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-310-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-290-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-260-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-250-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-230-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-220-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-200-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-190-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-180-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | | | | | | | | | | | | | | | | |\
| * | | | | | | | | | | | | | | | | | \ merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | / | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-090-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-070-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-070-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | | | Camera2: Don't promote weak IBinder ptrs to strong onesIgor Murashkin2012-10-052-12/+14
| | | | | | | * | | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-050-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | | | | | | | | Camera2: Fix deadlock while zooming during recordIgor Murashkin2012-10-041-11/+11
| | | | | | | | * | | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-040-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | | | | | | | | | | | Camera2: Properly update FPS range when FPS is set.Eino-Ville Talvala2012-10-031-0/+4
| | | | | | | | | * | | | | | | | | | | | | | | | Drop video bitrate to 2.5mbps.Dave Burke2012-10-031-1/+1
| | | | | | | | | * | | | | | | | | | | | | | | | Better power savings with wifi display code.Andreas Huber2012-10-034-22/+104
| | | | | | | | | * | | | | | | | | | | | | | | | Increase polling frequency again temporarily to fix A/V issuesAndreas Huber2012-10-032-14/+24
| | | | | | | | | * | | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-030-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-020-0/+0
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | | | | | | | | | | Perform an orderly shutdown if possible, force disconnect if necessaryAndreas Huber2012-10-013-7/+71
| | | | | | | | | | | * | | | | | | | | | | | | | | | Remove double negatives from SurfaceMediaSourceAndreas Huber2012-10-012-9/+12
| | | | | | | | | | | * | | | | | | | | | | | | | | | Make sure we still handle shutdown-related message even if we'reAndreas Huber2012-10-011-20/+7
| | | | | | | | | | | * | | | | | | | | | | | | | | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-300-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-09-280-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \