summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am e418cfae: am 869e0798: Merge "MTP: add strict bounds checking for all inco...Mike Lockwood2014-11-1319-189/+386
|\
| * am 869e0798: Merge "MTP: add strict bounds checking for all incoming packets"...Mike Lockwood2014-11-1319-189/+386
| |\
| | * Merge "MTP: add strict bounds checking for all incoming packets" into lmp-mr1...Mike Lockwood2014-11-1319-189/+386
| | |\
| | | * MTP: add strict bounds checking for all incoming packetsMike Lockwood2014-11-1219-189/+386
* | | | am cf957fb7: am 94691b01: Merge "Fix Ogg Vorbis packet timestamps" into lmp-m...Marco Nelissen2014-11-121-14/+61
|\ \ \ \ | |/ / /
| * | | am 94691b01: Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-devMarco Nelissen2014-11-121-14/+61
| |\ \ \ | | |/ /
| | * | Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-devMarco Nelissen2014-11-121-14/+61
| | |\ \
| | | * | Fix Ogg Vorbis packet timestampsMarco Nelissen2014-11-111-14/+61
* | | | | am 06ce4cf5: Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-de...Chien-Yu Chen2014-11-122-15/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-devChien-Yu Chen2014-11-122-15/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-devChien-Yu Chen2014-11-122-15/+5
| | |\ \ \
| | | * | | Camera2Device: fix camera metadata leaksChien-Yu Chen2014-11-102-15/+5
* | | | | | am 233ef496: Merge "Fix looping sound playback" into lmp-mr1-dev automerge: 5...Marco Nelissen2014-11-121-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix looping sound playback" into lmp-mr1-devMarco Nelissen2014-11-121-0/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix looping sound playback" into lmp-mr1-devMarco Nelissen2014-11-121-0/+5
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Fix looping sound playbackMarco Nelissen2014-11-111-0/+5
| | | | |/ | | | |/|
* | | | | am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" in...Andy Hung2014-11-121-2/+5
|\ \ \ \ \ | |/ / / /
| * | | | am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" in...Andy Hung2014-11-111-2/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-devAndy Hung2014-11-111-2/+5
| | |\ \ \ | | | |/ / | | |/| |
| | | * | MediaCodec: Prevent stop() in the UNINITIALIZED stateAndy Hung2014-11-041-2/+5
* | | | | am 2f702c9b: am 43e10bb7: Merge "Move to libc++."Dan Albert2014-11-113-23/+3
|\ \ \ \ \
| * \ \ \ \ am 43e10bb7: Merge "Move to libc++."Dan Albert2014-11-113-23/+3
| |\ \ \ \ \
| | * \ \ \ \ Merge "Move to libc++."Dan Albert2014-11-113-23/+3
| | |\ \ \ \ \
| | | * | | | | Move to libc++.Dan Albert2014-11-113-23/+3
| | |/ / / / /
* | | | | | | am e71da1f7: Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTra...Robert Shih2014-11-112-4/+6
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" in...Robert Shih2014-11-111-4/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" in...Robert Shih2014-11-111-4/+5
| | |\ \ \ \ \
| | | * | | | | MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndexRobert Shih2014-11-081-4/+5
| * | | | | | | Merge "PlaylistFetcher: clear mStartup for .aac playlists after seek" into lm...Robert Shih2014-11-111-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "PlaylistFetcher: clear mStartup for .aac playlists after seek" into lm...Robert Shih2014-11-111-0/+1
| | |\ \ \ \ \ \
| | | * | | | | | PlaylistFetcher: clear mStartup for .aac playlists after seekRobert Shih2014-11-071-0/+1
* | | | | | | | | am e56d4991: am 8e2b445f: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicy...Eric Laurent2014-11-110-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 8e2b445f: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: boun...Eric Laurent2014-11-110-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 8e2b445f: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: boun...Eric Laurent2014-11-110-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ am 8e2b445f: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: boun...Eric Laurent2014-11-110-0/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size ...Eric Laurent2014-11-110-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size ...Eric Laurent2014-11-112-5/+13
| | | | | |\ \ \ \ \ \ \
* | | | | | \ \ \ \ \ \ \ am d016b9bc: am f840fc85: am 17c2c87c: am 6d60079e: am 99370d2d: am ae6965ae:...Eric Laurent2014-11-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am f840fc85: am 17c2c87c: am 6d60079e: am 99370d2d: am ae6965ae: am 3aef3560:...Eric Laurent2014-11-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 17c2c87c: am 6d60079e: am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6:...Eric Laurent2014-11-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am 6d60079e: am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicy...Eric Laurent2014-11-102-5/+13
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: boun...Eric Laurent2014-11-102-5/+13
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | |/| | | | | | |
| | | | | * | | | | | | | am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size ...Eric Laurent2014-11-102-5/+13
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefau...Eric Laurent2014-11-102-5/+13
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-102-5/+13
| | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-102-5/+13
* | | | | | | | | | | | | | | | am 7b28e4e7: am 9527a598: Merge "Camera: Guard against asBinder() calls on NU...Eino-Ville Talvala2014-11-117-17/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 9527a598: Merge "Camera: Guard against asBinder() calls on NULL interfaces"Eino-Ville Talvala2014-11-117-17/+27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "Camera: Guard against asBinder() calls on NULL interfaces"Eino-Ville Talvala2014-11-107-17/+27
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Camera: Guard against asBinder() calls on NULL interfacesEino-Ville Talvala2014-11-077-17/+27