summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" i...Christopher Tate2015-01-211-0/+1
|\
| * am 77c96dd8: Merge "Don\'t launch broadcast receiver processes during boot" i...Christopher Tate2015-01-201-0/+1
| |\
| | * Don't launch broadcast receiver processes during bootChristopher Tate2015-01-201-0/+1
* | | Merge "Replace broadcasts with calls to IAudioService.setWiredDeviceConnectio...Mike Lockwood2015-01-172-84/+0
|\ \ \
| * | | Replace broadcasts with calls to IAudioService.setWiredDeviceConnectionState(...Mike Lockwood2015-01-162-84/+0
* | | | am c2230a9d: am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock ...Jean-Michel Trivi2015-01-161-9/+10
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock issue."Jean-Michel Trivi2015-01-161-9/+10
| |\ \
| | * \ Merge "Prevent AudioService dead lock issue."Jean-Michel Trivi2015-01-161-9/+10
| | |\ \
| | | * | Prevent AudioService dead lock issue.seunghwan.hong2015-01-131-9/+10
| | * | | Merge "MediaCodec/Image: handle null cropRect correctly"Lajos Molnar2015-01-102-6/+10
| | |\ \ \
| | | * | | MediaCodec/Image: handle null cropRect correctlyLajos Molnar2014-12-042-6/+10
| | * | | | Merge "media: add support for 160-byte image info in MediaCodec"Lajos Molnar2015-01-101-4/+4
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | media: add support for 160-byte image info in MediaCodecLajos Molnar2014-12-041-4/+4
| | | |/ /
* | | | | am c3fb94ca: am 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEve...Eric Laurent2015-01-162-89/+91
|\ \ \ \ \ | |/ / / /
| * | | | am 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler sta...Eric Laurent2015-01-152-89/+91
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | AudioManager: make AudioPortEventHandler staticEric Laurent2015-01-152-89/+91
* | | | | Merge "Fix bad import in VideoDumpActivity"Yohann Roussel2015-01-151-1/+1
|\ \ \ \ \
| * | | | | Fix bad import in VideoDumpActivityYohann Roussel2015-01-131-1/+1
* | | | | | Merge "AudioService: force use impacts BECOMING_NOISY intent"Jean-Michel Trivi2015-01-151-8/+30
|\ \ \ \ \ \
| * | | | | | AudioService: force use impacts BECOMING_NOISY intentJean-Michel Trivi2015-01-141-8/+30
| |/ / / / /
* | | | | | am e5a25a76: am ad58ca67: Merge "AudioService: handle stream mute by stream a...Eric Laurent2015-01-141-10/+16
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am ad58ca67: Merge "AudioService: handle stream mute by stream alias" into lm...Eric Laurent2015-01-131-10/+16
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | AudioService: handle stream mute by stream aliasEric Laurent2015-01-131-10/+16
* | | | | | Merge commit 'fe254b6e' into manualmergeEric Laurent2015-01-131-2/+4
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | am 695233fe: Merge "AudioService: send connection intent for HDMI ARC device"...Eric Laurent2015-01-121-2/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1...Eric Laurent2015-01-121-2/+4
| | |\ \ \
| | | * | | AudioService: send connection intent for HDMI ARC deviceEric Laurent2015-01-091-2/+4
* | | | | | am 2a7991ee: am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." ...Rachad2015-01-101-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6d3cff12: Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-devRachad2015-01-101-0/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "MediaCodec: Added E-AC3 mime type (@hide)." into lmp-mr1-devRachad2015-01-101-0/+4
| | |\ \ \ \
| | | * | | | MediaCodec: Added E-AC3 mime type (@hide).Rachad2014-12-231-0/+4
| | * | | | | Use NULL instead of 0 when invoking CallStaticVoidMethodHaitao Feng2015-01-082-2/+2
| | | |/ / / | | |/| | |
* | | | | | Merge "Support for simultaneous USB Audio Devices connect/disconnect"Paul McLean2015-01-091-2/+6
|\ \ \ \ \ \
| * | | | | | Support for simultaneous USB Audio Devices connect/disconnectPaul McLean2015-01-091-2/+6
* | | | | | | Merge "Reload MediaBrowser children on each call to subscribe"RoboErik2015-01-082-10/+10
|\ \ \ \ \ \ \
| * | | | | | | Reload MediaBrowser children on each call to subscribeRoboErik2015-01-072-10/+10
| |/ / / / / /
* | | | | | | Merge "Use channelCountFromOutChannelMask in AudioTrack"Andy Hung2015-01-081-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use channelCountFromOutChannelMask in AudioTrackAndy Hung2015-01-061-3/+3
* | | | | | | am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for point...Narayan Kamath2015-01-062-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments ...Narayan Kamath2015-01-062-2/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."Narayan Kamath2015-01-062-2/+2
| | |\ \ \ \
| | | * | | | Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.Haitao Feng2015-01-062-2/+2
* | | | | | | am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Race-condition in SoundPool during releaseDariusz Iwanoczko2014-11-111-3/+3
* | | | | | | Merge "Fix build"Glenn Kasten2014-12-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix buildGlenn Kasten2014-12-291-1/+1
* | | | | | | | Merge "Update API documentation for static AudioTrack"Glenn Kasten2014-12-291-11/+47
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Update API documentation for static AudioTrackGlenn Kasten2014-12-231-11/+47