summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-devJeff Tinker2014-11-181-1/+5
|\
| * Fix missing mutex lock in Drm::binderDiedJeff Tinker2014-11-161-1/+5
* | Merge "Prevent stopped audio tracks from mixing data" into lmp-mr1-devAndy Hung2014-11-181-8/+9
|\ \
| * | Prevent stopped audio tracks from mixing dataAndy Hung2014-11-171-8/+9
* | | Merge "Fix race condition in signaling completion for decode." into lmp-mr1-devAndy Hung2014-11-171-0/+1
|\ \ \
| * | | Fix race condition in signaling completion for decode.Andy Hung2014-11-171-0/+1
| |/ /
* | | Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-devRobert Shih2014-11-176-0/+56
|\ \ \
| * | | NuPlayer HTTPLiveSource: impl getSelectedTrackRobert Shih2014-11-066-0/+56
* | | | Merge "audiopolicy: Update input device check in checkInputsForDevice" into l...Eric Laurent2014-11-171-3/+6
|\ \ \ \
| * | | | audiopolicy: Update input device check in checkInputsForDeviceEric Laurent2014-11-171-3/+6
* | | | | Merge "CameraService: normalize face rectangles properly" into lmp-mr1-devChien-Yu Chen2014-11-173-73/+90
|\ \ \ \ \
| * | | | | CameraService: normalize face rectangles properlyChien-Yu Chen2014-11-133-73/+90
* | | | | | Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into ...Wei Jia2014-11-157-124/+205
|\ \ \ \ \ \
| * | | | | | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-147-124/+205
* | | | | | | Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-devRobert Shih2014-11-151-27/+37
|\ \ \ \ \ \ \
| * | | | | | | PlaylistFetcher: handle sporadic fetch errosRobert Shih2014-11-131-27/+37
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-devEric Laurent2014-11-143-30/+15
|\ \ \ \ \ \ \
| * | | | | | | remove AudioSystem::getOutputSamplingRateForAttr()Eric Laurent2014-11-123-30/+15
* | | | | | | | Merge "stagefright: add runtime debug support" into lmp-mr1-devLajos Molnar2014-11-1411-440/+830
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | stagefright: add runtime debug supportLajos Molnar2014-11-1211-440/+830
* | | | | | | | Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-devChong Zhang2014-11-132-168/+105
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Stagefright: use MediaCodec in async mode for recordingPraveen Chavan2014-11-122-168/+105
| * | | | | | | merge in lmp-mr1-release history after reset to 1cf9ad1abb599ce4057189e0db154...The Android Automerger2014-11-060-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | merge in lmp-mr1-release history after reset to ed1e55c5276a1c031e9b2f016387c...The Android Automerger2014-11-050-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ed1e55c5276a1c031e9b2f016387c...The Android Automerger2014-11-040-0/+0
| | | |\ \ \ \ \ \ | | |/ / / / / / /
| | | * | | | | | merge in lmp-mr1-release history after reset to 151b3f41ffcdf187580542ba0c0d3...The Android Automerger2014-11-030-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 151b3f41ffcdf187580542ba0c0d3...The Android Automerger2014-11-020-0/+0
| | | | |\ \ \ \ \ \ | | | |/ / / / / / /
| | | | * | | | | | merge in lmp-mr1-release history after reset to d9cfeb447356cb6334379eaf5da1e...The Android Automerger2014-11-010-0/+0
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 7011ee31d65917a9e15b271942e86...The Android Automerger2014-10-300-0/+0
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 6e8212b2a02685e50d0c093a6f44d...The Android Automerger2014-10-290-0/+0
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 701b96474dc8afd16046e440975e0...The Android Automerger2014-10-280-0/+0
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088...The Android Automerger2014-10-270-0/+0
| | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088...The Android Automerger2014-10-260-0/+0
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / / /
| | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to 8bfa96c2f7c098550b00b84677088...The Android Automerger2014-10-250-0/+0
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / / /
| | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to b9b21bc11bfb6e77cc0f9e9a31de0...The Android Automerger2014-10-230-0/+0
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 171fa1607e8bc3e94c2c9ff080777...The Android Automerger2014-10-220-0/+0
| | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to d61ba0aae5c3155a3e232490129f9...The Android Automerger2014-10-210-0/+0
| | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to dfe7616237240e8a5c4cb26ba395b...The Android Automerger2014-10-200-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to dfe7616237240e8a5c4cb26ba395b...The Android Automerger2014-10-190-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | |/ / / / / / /
| | | | | | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to dfe7616237240e8a5c4cb26ba395b...The Android Automerger2014-10-180-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | |/ / / / / / /
| | | | | | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to 7771ebfe2457da705439b16cdb80b...The Android Automerger2014-10-160-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to fc1d3da510310ce72aee8a68f103e...The Android Automerger2014-10-150-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 45b944024edde49c27371c7323627...The Android Automerger2014-10-140-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 0f69763d41c101a2afcac7f10be86...The Android Automerger2014-10-130-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to d763561844c4f1c45703f25a37b8f...The Android Automerger2014-10-120-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to d763561844c4f1c45703f25a37b8f...The Android Automerger2014-10-110-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | |/ / / / / / /
| | | | | | | | | | | | | | | | | | * | | | | | audio policy: move intializations to onFirstRef()Eric Laurent2014-10-102-0/+7
| | | | | | | | | | | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to 58202e1d7e4d244e1d93699c840d2...The Android Automerger2014-10-090-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 58202e1d7e4d244e1d93699c840d2...The Android Automerger2014-10-080-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | |/ / / / / / /
| | | | | | | | | | | | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to 1318a60824c4f787e54fbbc8a388c...The Android Automerger2014-10-070-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \