summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am a97f20bb: am 2bbc61fe: am 408dba5f: Merge "HLS: fix live lock after missin...Robert Shih2014-11-191-0/+20
|\
| * am 2bbc61fe: am 408dba5f: Merge "HLS: fix live lock after missing the boat du...Robert Shih2014-11-191-0/+20
| |\
| | * Merge "HLS: fix live lock after missing the boat during configuration change"...Robert Shih2014-11-191-0/+20
| | |\
| | | * HLS: fix live lock after missing the boat during configuration changeRobert Shih2014-11-181-0/+20
* | | | am dae9df0a: am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" ...Marco Nelissen2014-11-192-0/+20
|\ \ \ \ | |/ / /
| * | | am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-192-0/+20
| |\ \ \ | | |/ /
| | * | Merge "Don't autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-192-0/+20
| | |\ \ | | | |/ | | |/|
| | | * Don't autoloop notificationsMarco Nelissen2014-11-182-0/+20
* | | | am fab5ad93: am 2f65ada8: am 993d57ec: Merge "NuPlayer: pass media time to se...Robert Shih2014-11-198-13/+39
|\ \ \ \ | |/ / /
| * | | am 2f65ada8: am 993d57ec: Merge "NuPlayer: pass media time to selectTrack for...Robert Shih2014-11-198-13/+39
| |\ \ \ | | |/ /
| | * | Merge "NuPlayer: pass media time to selectTrack for responsiveness" into lmp-...Robert Shih2014-11-198-13/+39
| | |\ \
| | | * | NuPlayer: pass media time to selectTrack for responsivenessRobert Shih2014-11-198-13/+39
| | | |/
* | | | am 9544a8e9: am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent ro...Eric Laurent2014-11-181-0/+5
|\ \ \ \ | |/ / /
| * | | am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent routing to A2DP...Eric Laurent2014-11-181-0/+5
| |\ \ \ | | |/ /
| | * | Merge "audio policy: do not prevent routing to A2DP when suspended." into lmp...Eric Laurent2014-11-181-0/+5
| | |\ \ | | | |/ | | |/|
| | | * audio policy: do not prevent routing to A2DP when suspended.Eric Laurent2014-11-171-0/+5
* | | | am 3126b503: am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \ \ | |/ / /
| * | | am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
| |\ \ \
| | * \ \ Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
| | |\ \ \
| | | * | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
* | | | | | am b08869a4: am dd9d3e50: am 48b447fe: Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am dd9d3e50: am 48b447fe: Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fix uninitialized variableBernhard Rosenkränzer2014-11-181-1/+1
| | |/ / /
* | | | | am e6dce194: am efd33e8d: am 35b0f709: Merge "Fix missing mutex lock in Drm::...Jeff Tinker2014-11-181-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | am efd33e8d: am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" i...Jeff Tinker2014-11-181-1/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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
* | | | | am 932ab10f: am 1c764234: am 88ec9e99: Merge "Fix race condition in signaling...Andy Hung2014-11-181-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 1c764234: am 88ec9e99: Merge "Fix race condition in signaling completion f...Andy Hung2014-11-181-0/+1
| |\ \ \ \ | | |/ / /
| | * | | 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
* | | | | | am ef2af979: am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl g...Robert Shih2014-11-186-0/+56
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl getSelectedTra...Robert Shih2014-11-186-0/+56
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-devRobert Shih2014-11-176-0/+56
| | |\ \ \ \
| | | * | | | NuPlayer HTTPLiveSource: impl getSelectedTrackRobert Shih2014-11-066-0/+56
* | | | | | | am e0064399: am 26d92768: am 34c55e3e: Merge "No need to #include atomic-inli...Elliott Hughes2014-11-171-1/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 26d92768: am 34c55e3e: Merge "No need to #include atomic-inline.h if you h...Elliott Hughes2014-11-171-1/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | No need to #include atomic-inline.h if you have atomic.h.Elliott Hughes2014-11-171-1/+0
* | | | | | | am 8c5ee61a: am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1711-13/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1711-13/+12
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1711-13/+12
| | |\ \ \ \ \
| | | * | | | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-1711-13/+12
* | | | | | | | am f1b0c671: am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-a...Elliott Hughes2014-11-171-12/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-171-12/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-2/+0
| | |/ / / / /
| * | | | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-1727-77/+76
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 9b77083e: Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-1727-77/+76
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-1727-77/+76
* | | | | | | | am 575174d6: am bb0cf4d0: am d0264109: Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am bb0cf4d0: am d0264109: Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /