summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 5adeaeab: am 02f7f449: Merge "Correct java API docs for MediaDrm offline u...Jeff Tinker2013-05-081-5/+10
|\
| * am 02f7f449: Merge "Correct java API docs for MediaDrm offline use case" into...Jeff Tinker2013-05-071-5/+10
| |\
| | * Correct java API docs for MediaDrm offline use caseJeff Tinker2013-05-071-5/+10
* | | Merge "Fix BT SCO audio test application."Eric Laurent2013-05-081-6/+11
|\ \ \
| * | | Fix BT SCO audio test application.Eric Laurent2013-05-011-6/+11
* | | | Add new app ops for various interesting audio service things.Dianne Hackborn2013-05-064-44/+101
* | | | am 9ba564c7: am 48f2b548: Merge "MediaDrm API: Add two exceptions to handle e...Jeff Tinker2013-05-016-17/+120
|\ \ \ \ | | |/ / | |/| |
| * | | am 48f2b548: Merge "MediaDrm API: Add two exceptions to handle error path sce...Jeff Tinker2013-05-016-17/+120
| |\ \ \ | | | |/ | | |/|
| | * | Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into ...Jeff Tinker2013-05-016-17/+120
| | |\ \
| | | * | MediaDrm API: Add two exceptions to handle error path scenariosJeff Tinker2013-04-306-17/+120
* | | | | am 94264d52: am 2f4cc8ea: Merge "Fix a crash case" into jb-mr2-devMike J. Chen2013-05-011-5/+6
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am 2f4cc8ea: Merge "Fix a crash case" into jb-mr2-devMike J. Chen2013-05-011-5/+6
| |\ \ \ | | |/ /
| | * | Merge "Fix a crash case" into jb-mr2-devMike J. Chen2013-05-011-5/+6
| | |\ \
| | | * | Fix a crash caseMike J. Chen2013-04-261-5/+6
| | | |/
| * | | am 25619b2c: libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| |\ \ \ | | |/ /
| | * | libdrm: fix bad strncpy / snprintf callsNick Kralevich2013-04-292-7/+43
| | |/
* | | Fix javadoc errors for @deprecated tags with no explanatory commentMike Lockwood2013-04-291-5/+4
* | | Remove obsolete OMA-DRM supportMike Lockwood2013-04-2937-10298/+20
* | | am 448c6ca4: am ea236f19: Merge "Identify in logs launch of voice search from...Jean-Michel Trivi2013-04-231-0/+2
|\ \ \ | |/ /
| * | am ea236f19: Merge "Identify in logs launch of voice search from key events" ...Jean-Michel Trivi2013-04-231-0/+2
| |\ \ | | |/
| | * Merge "Identify in logs launch of voice search from key events" into jb-mr2-devJean-Michel Trivi2013-04-231-0/+2
| | |\
| | | * Identify in logs launch of voice search from key eventsJean-Michel Trivi2013-04-191-0/+2
* | | | am cb315af3: am fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient pos...Jean-Michel Trivi2013-04-235-23/+182
|\ \ \ \ | |/ / /
| * | | am fb0b6a81: Merge "Opt-in mechanism for RemoteControlClient position anti-dr...Jean-Michel Trivi2013-04-235-23/+182
| |\ \ \ | | |/ /
| | * | Merge "Opt-in mechanism for RemoteControlClient position anti-drift check" in...Jean-Michel Trivi2013-04-225-23/+182
| | |\ \
| | | * | Opt-in mechanism for RemoteControlClient position anti-drift checkJean-Michel Trivi2013-04-225-23/+182
| | | |/
* | | | am 0f70770b: am b5ec8c14: Change doc comment to match API changeKenny Root2013-04-201-1/+1
|\ \ \ \ | |/ / /
| * | | am b5ec8c14: Change doc comment to match API changeKenny Root2013-04-201-1/+1
| |\ \ \ | | |/ /
| | * | Change doc comment to match API changeKenny Root2013-04-191-1/+1
* | | | Merge "Fix AOSP issue 9742: Documentation inconsistancy [sic] in AudioTrack"Glenn Kasten2013-04-191-1/+1
|\ \ \ \
| * | | | Fix AOSP issue 9742: Documentation inconsistancy [sic] in AudioTrackGlenn Kasten2013-04-191-1/+1
* | | | | am 408e6637: am 26a54eca: Merge "Correct algorithm property name and clarify ...Jeff Tinker2013-04-191-3/+3
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 26a54eca: Merge "Correct algorithm property name and clarify javadoc descr...Jeff Tinker2013-04-191-3/+3
| |\ \ \ | | |/ /
| | * | Correct algorithm property name and clarify javadoc description ofJeff Tinker2013-04-191-3/+3
| | |/
* | | am 0068e00d: am 91695a0c: Merge "Anti-drift in RCC playback position" into jb...Jean-Michel Trivi2013-04-191-1/+118
|\ \ \ | |/ /
| * | am 91695a0c: Merge "Anti-drift in RCC playback position" into jb-mr2-devJean-Michel Trivi2013-04-191-1/+118
| |\ \ | | |/
| | * Merge "Anti-drift in RCC playback position" into jb-mr2-devJean-Michel Trivi2013-04-191-1/+118
| | |\
| | | * Anti-drift in RCC playback positionJean-Michel Trivi2013-04-181-1/+118
* | | | am 747847fa: am 56af4f21: Merge "AudioService: SCO audio backward compatibili...Eric Laurent2013-04-193-13/+55
|\ \ \ \ | |/ / /
| * | | am 56af4f21: Merge "AudioService: SCO audio backward compatibility" into jb-m...Eric Laurent2013-04-193-13/+55
| |\ \ \ | | |/ /
| | * | Merge "AudioService: SCO audio backward compatibility" into jb-mr2-devEric Laurent2013-04-193-13/+55
| | |\ \
| | | * | AudioService: SCO audio backward compatibilityEric Laurent2013-04-173-13/+55
* | | | | am dbc26a86: am 6ead6cca: Merge "Add some documentation to MediaCodecInfo" in...Andreas Huber2013-04-191-0/+14
|\ \ \ \ \ | |/ / / /
| * | | | am 6ead6cca: Merge "Add some documentation to MediaCodecInfo" into jb-mr2-devAndreas Huber2013-04-191-0/+14
| |\ \ \ \ | | |/ / /
| | * | | Merge "Add some documentation to MediaCodecInfo" into jb-mr2-devAndreas Huber2013-04-191-0/+14
| | |\ \ \
| | | * | | Add some documentation to MediaCodecInfoAndreas Huber2013-04-181-0/+14
* | | | | | am a393c2a2: am c884a08e: Merge "Improve error handling for DRM errors report...Jeff Tinker2013-04-181-0/+53
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c884a08e: Merge "Improve error handling for DRM errors reported by plugins...Jeff Tinker2013-04-181-0/+53
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2...Jeff Tinker2013-04-181-0/+53
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Improve error handling for DRM errors reported by pluginsJeff Tinker2013-04-171-0/+53