summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
| | * | | | | Adjust format strings to work on both 32-bit and 64-bit buildsBernhard Rosenkränzer2014-12-055-6/+6
| * | | | | | Merge "media: fix isSupportedFormat for integer frame rate"Lajos Molnar2014-12-081-4/+4
| |\ \ \ \ \ \
| | * | | | | | media: fix isSupportedFormat for integer frame rateLajos Molnar2014-12-041-4/+4
| | |/ / / / /
| * | | | | | media: allow full range of Vorbis sampling ratesLajos Molnar2014-12-041-1/+1
| |/ / / / /
* | | | | | resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aospEric Laurent2014-12-102-16/+14
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-...Eric Laurent2014-12-102-16/+14
| |\ \ \ \ \
| | * | | | | AudioSystem JNI: Add audio policy custom mixes registrationEric Laurent2014-12-082-16/+14
| | | |_|/ / | | |/| | |
* | | | | | am c6de3212: Merge "Don\'t try to scale the bitmaps for null MediaMetadata." ...Michael Wright2014-12-101-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Don't try to scale the bitmaps for null MediaMetadata." into lmp-mr1-devMichael Wright2014-12-091-1/+3
| |\ \ \ \ \
| | * | | | | Don't try to scale the bitmaps for null MediaMetadata.Michael Wright2014-12-091-1/+3
| | | |_|/ / | | |/| | |
* | | | | | am 1102e712: Merge "Throw IOException when missing default ringtone." into lm...Jeff Sharkey2014-12-092-6/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Throw IOException when missing default ringtone." into lmp-mr1-devJeff Sharkey2014-12-092-6/+11
| |\ \ \ \ \
| | * | | | | Throw IOException when missing default ringtone.Jeff Sharkey2014-12-092-6/+11
| | | |/ / / | | |/| | |
generated by cgit v1.1 at 2025-03-14 13:24:21 +0000