Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 48cb6d7c: Merge "Fix short sound playback" into lmp-mr1-dev | Marco Nelissen | 2014-11-11 | 1 | -0/+4 |
|\ | |||||
| * | Merge "Fix short sound playback" into lmp-mr1-dev | Marco Nelissen | 2014-11-10 | 1 | -0/+4 |
| |\ | |||||
| | * | Fix short sound playback | Marco Nelissen | 2014-11-05 | 1 | -0/+4 |
* | | | am 21efaad1: Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequ... | Robert Shih | 2014-11-10 | 2 | -11/+18 |
|\ \ \ | |/ / | |||||
| * | | Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs" in... | Robert Shih | 2014-11-10 | 2 | -11/+18 |
| |\ \ | |||||
| | * | | GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs | Robert Shih | 2014-11-10 | 2 | -11/+18 |
* | | | | am eb0827f3: am c5160b34: Merge "Remove the executable bit from source files" | Glenn Kasten | 2014-11-10 | 91 | -0/+0 |
|\ \ \ \ | |||||
| * \ \ \ | am c5160b34: Merge "Remove the executable bit from source files" | Glenn Kasten | 2014-11-10 | 91 | -0/+0 |
| |\ \ \ \ | |||||
| | * | | | | Remove the executable bit from source files | Martin Storsjo | 2014-11-07 | 91 | -0/+0 |
| | * | | | | Resolve conflict | The Android Open Source Project | 2014-11-06 | 358 | -10568/+34032 |
| | |\ \ \ \ | |||||
* | | \ \ \ \ | am 53fea876: Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-dev... | Robert Shih | 2014-11-10 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-dev | Robert Shih | 2014-11-10 | 1 | -0/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | HTTPLiveSource: NULL check in getFormat | Robert Shih | 2014-11-08 | 1 | -0/+4 |
| | | |_|_|/ / | | |/| | | | | |||||
* | | | | | | | am b177468b: Merge "Improve AudioTrack recovery from mediaserver death" into ... | Glenn Kasten | 2014-11-07 | 2 | -19/+31 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-dev | Glenn Kasten | 2014-11-07 | 2 | -19/+31 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Improve AudioTrack recovery from mediaserver death | Glenn Kasten | 2014-11-05 | 2 | -19/+31 |
| | |/ / / / / | |||||
* | | | | | | | am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailab... | Dan Stoza | 2014-11-07 | 3 | -3/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev | Dan Stoza | 2014-11-07 | 3 | -3/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add a BufferItem parameter to onFrameAvailable | Dan Stoza | 2014-11-04 | 3 | -3/+3 |
* | | | | | | | | am 7e88fac0: Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev au... | Eric Laurent | 2014-11-07 | 1 | -15/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev | Eric Laurent | 2014-11-07 | 1 | -15/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | AudioSystem: remove obsolete method. | Eric Laurent | 2014-11-06 | 1 | -15/+0 |
* | | | | | | | | | am 113adbbc: resolved conflicts for merge of bcf093bf to stage-aosp-master | Narayan Kamath | 2014-11-07 | 1 | -1/+13 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | resolved conflicts for merge of bcf093bf to stage-aosp-master | Narayan Kamath | 2014-11-07 | 1 | -1/+13 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | / / | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | Fix definining of ANDROID_SMP. | Ian Rogers | 2014-11-06 | 1 | -1/+14 |
* | | | | | | | | am d11895bc: am 62fe78b6: Merge "Fix memory leak" into lmp-mr1-dev | Glenn Kasten | 2014-11-07 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge "Fix memory leak" into lmp-mr1-dev | Glenn Kasten | 2014-11-07 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix memory leak | Glenn Kasten | 2014-11-06 | 1 | -3/+3 |
* | | | | | | | | | am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue discontinity signal... | Wei Jia | 2014-11-07 | 9 | -57/+55 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resul... | Wei Jia | 2014-11-06 | 9 | -57/+55 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted fro... | Wei Jia | 2014-11-06 | 9 | -57/+55 |
| | | |_|_|/ / / | | |/| | | | | | |||||
* | | | | | | | | am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format c... | Jeff Tinker | 2014-11-06 | 4 | -1/+41 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-dev | Jeff Tinker | 2014-11-06 | 4 | -1/+41 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Pass resolution to Crypto plugin on format change | Jeff Tinker | 2014-11-03 | 4 | -1/+41 |
* | | | | | | | | | am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into lmp-mr... | Jeff Tinker | 2014-11-06 | 3 | -2/+71 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Add missing secure stop methods" into lmp-mr1-dev | Jeff Tinker | 2014-11-06 | 3 | -2/+71 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | / / / / / | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Add missing secure stop methods | Jeff Tinker | 2014-10-31 | 3 | -2/+71 |
* | | | | | | | | am 7e31774e: am 74adca9a: IAudioPolicyService: bound array size in queryDefau... | Eric Laurent | 2014-11-05 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | IAudioPolicyService: bound array size in queryDefaultPreProcessing | Eric Laurent | 2014-11-05 | 1 | -3/+6 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | am 5ae9280b: Merge "audio: fix talkback why alarm is playing" into lmp-mr1-de... | Eric Laurent | 2014-11-04 | 1 | -4/+11 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "audio: fix talkback why alarm is playing" into lmp-mr1-dev | Eric Laurent | 2014-11-04 | 1 | -4/+11 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | audio: fix talkback why alarm is playing | Eric Laurent | 2014-11-03 | 1 | -4/+11 |
* | | | | | | | am 7957cf09: am d9cfeb44: Support speaker routing for FLAG_BEACON | Jean-Michel Trivi | 2014-11-01 | 1 | -2/+10 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Support speaker routing for FLAG_BEACON | Jean-Michel Trivi | 2014-10-31 | 1 | -2/+10 |
* | | | | | | | am b0163c6d: AudioTrack::flush() will no longer flush later data automerge: 2... | Glenn Kasten | 2014-10-31 | 1 | -5/+22 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | AudioTrack::flush() will no longer flush later data | Glenn Kasten | 2014-10-30 | 1 | -5/+22 |
| |/ / / / / | |||||
* | | | | | | am b2147445: am 7011ee31: Merge "NuPlayer: reduce offload pause teardown time... | Eric Laurent | 2014-10-31 | 2 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-dev | Eric Laurent | 2014-10-29 | 2 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | NuPlayer: reduce offload pause teardown timeout. | Eric Laurent | 2014-10-29 | 2 | -2/+2 |
* | | | | | | | am 97d84d7f: am cde2b722: Merge "NuPlayer: merge start() and resume()." into ... | Wei Jia | 2014-10-31 | 3 | -105/+103 |
|\ \ \ \ \ \ \ | |/ / / / / / |