summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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 4772f8b8: am 16cfa8dd: Merge "AudioManager: make AudioPortEventHandler sta...Eric Laurent2015-01-152-89/+91
|\ \ \ \ | | |_|/ | |/| |
| * | | AudioManager: make AudioPortEventHandler staticEric Laurent2015-01-152-89/+91
* | | | 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
* | | | 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 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
| | |/ / / | |/| | |
* | | | | 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
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Race-condition in SoundPool during release"Narayan Kamath2015-01-051-3/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Race-condition in SoundPool during releaseDariusz Iwanoczko2014-11-111-3/+3
* | | | | | am af84e073: Merge "Audio Policy: Clear calling identity for all paths settin...John Spurlock2014-12-281-32/+27
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge "Audio Policy: Clear calling identity for all paths setting ringer mode...John Spurlock2014-12-241-32/+27
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Audio Policy: Clear calling identity for all paths setting ringer mode.John Spurlock2014-12-231-32/+27
* | | | | | am 98ba8409: am 996af72b: Merge "AudioRecord: filter attributes" into lmp-mr1...Jean-Michel Trivi2014-12-261-6/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "AudioRecord: filter attributes" into lmp-mr1-devJean-Michel Trivi2014-12-221-6/+11
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | AudioRecord: filter attributesJean-Michel Trivi2014-12-221-6/+11
* | | | | | am 05fce092: am 8d24fe23: Merge "AudioService: fix permission check." into lm...Eric Laurent2014-12-191-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "AudioService: fix permission check." into lmp-mr1-devEric Laurent2014-12-191-0/+3
| |\ \ \ \ \
| | * | | | | AudioService: fix permission check.Eric Laurent2014-12-181-0/+3
| | |/ / / /
* | | | | | am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Applica...Oliver Woodman2014-12-191-4/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1...Oliver Woodman2014-12-191-4/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | MediaSessionLegacyHelper uses global Application contextJean-Michel Trivi2014-12-181-4/+1
* | | | | | am caba3603: am e7f301a0: Merge "Audio policy: Fix deprecated shouldVibrate a...John Spurlock2014-12-171-23/+35
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Audio policy: Fix deprecated shouldVibrate api.John Spurlock2014-12-171-23/+35
| |/ / / /
* | | | | am 49b2f00a: am c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang2014-12-163-15/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-163-15/+0
* | | | | am d8858fa9: am a2bc055e: Merge "audioservice: Clear calling identity upon ca...Jinsuk Kim2014-12-131-10/+14
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge "audioservice: Clear calling identity upon calling HdmiControlService" ...Jinsuk Kim2014-12-131-10/+14
| |\ \ \ \
| | * | | | audioservice: Clear calling identity upon calling HdmiControlServiceJinsuk Kim2014-12-131-10/+14
* | | | | | am d4bef185: am bb177db1: Merge "parse bitrate range for video/audio caps" in...Chong Zhang2014-12-121-3/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "parse bitrate range for video/audio caps" into lmp-mr1-devChong Zhang2014-12-121-3/+20
| |\ \ \ \ \
| | * | | | | parse bitrate range for video/audio capsChong Zhang2014-12-121-3/+20
* | | | | | | am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit...Chih-hung Hsieh2014-12-115-6/+6
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge "Adjust format strings to work on both 32-bit and 64-bit builds"Chih-hung Hsieh2014-12-115-6/+6
| |\ \ \ \ \ \