summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 5054f906: am c98070a4: am 1b12db9e: Merge "media: set codec exception reas...Ronghua Wu2015-04-301-2/+2
|\
| * am c98070a4: am 1b12db9e: Merge "media: set codec exception reason." into mnc...Ronghua Wu2015-04-301-2/+2
| |\
| | * Merge "media: set codec exception reason." into mnc-devRonghua Wu2015-04-301-2/+2
| | |\
| | | * media: set codec exception reason.Ronghua Wu2015-04-281-2/+2
* | | | am 426a0c33: am f388c9e6: am f3d3856f: Merge "Check for null codec from AMedi...Andy Hung2015-04-301-4/+5
|\ \ \ \ | |/ / /
| * | | am f388c9e6: am f3d3856f: Merge "Check for null codec from AMediaCodec_create...Andy Hung2015-04-301-4/+5
| |\ \ \ | | |/ /
| | * | Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-devAndy Hung2015-04-301-4/+5
| | |\ \
| | | * | Check for null codec from AMediaCodec_createDecoderByTypeAndy Hung2015-04-291-4/+5
* | | | | am edcf5e1e: am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class ...Andy Hung2015-04-301-30/+4
|\ \ \ \ \ | |/ / / /
| * | | | am f17dd0b4: am 1afdbe3b: Merge "Pass PlaybackSettings as class object for Au...Andy Hung2015-04-301-30/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Pass PlaybackSettings as class object for AudioTrack JNI" into mnc-devAndy Hung2015-04-291-30/+4
| | |\ \ \ | | | |/ /
| | | * | Pass PlaybackSettings as class object for AudioTrack JNIAndy Hung2015-04-291-30/+4
* | | | | am 62b4cbce: am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version str...Mike Lockwood2015-04-291-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | am bcec6a49: am e1d00395: Merge "MidiDeviceInfo: Add version string property"...Mike Lockwood2015-04-291-0/+7
| |\ \ \ \ | | |/ / /
| | * | | Merge "MidiDeviceInfo: Add version string property" into mnc-devMike Lockwood2015-04-291-0/+7
| | |\ \ \
| | | * | | MidiDeviceInfo: Add version string propertyMike Lockwood2015-04-291-0/+7
| | | |/ /
* | | | | am 0dbaba6c: am 5e47c802: am 56867804: Merge "Respect the record audio app op...Svet Ganov2015-04-298-22/+92
|\ \ \ \ \ | |/ / / /
| * | | | am 5e47c802: am 56867804: Merge "Respect the record audio app op - framework"...Svet Ganov2015-04-298-22/+92
| |\ \ \ \ | | |/ / /
| | * | | Merge "Respect the record audio app op - framework" into mnc-devSvet Ganov2015-04-298-22/+92
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Respect the record audio app op - frameworkSvet Ganov2015-04-288-22/+92
| | | |/
* | | | am 23e46a4e: am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, D...John Spurlock2015-04-291-0/+2
|\ \ \ \ | |/ / /
| * | | am 2d67b288: am 8dbcda1b: Merge "Volume: Simple dialog footer, DND in quick s...John Spurlock2015-04-291-0/+2
| |\ \ \ | | |/ /
| | * | Merge "Volume: Simple dialog footer, DND in quick settings." into mnc-devJohn Spurlock2015-04-291-0/+2
| | |\ \
| | | * | Volume: Simple dialog footer, DND in quick settings.John Spurlock2015-04-291-0/+2
| | | |/
* | | | am d3fad391: am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an o...Dongwon Kang2015-04-291-5/+10
|\ \ \ \ | |/ / /
| * | | am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation take...Dongwon Kang2015-04-291-5/+10
| |\ \ \ | | |/ /
| | * | Merge "TIF: throw an exception if an operation takes too long." into mnc-devDongwon Kang2015-04-291-5/+10
| | |\ \ | | | |/ | | |/|
| | | * TIF: throw an exception if an operation takes too long.Dongwon Kang2015-04-291-5/+10
* | | | Merge "TIF: Put comments for the newly added US and Canadian rating strings"Jae Seo2015-04-291-0/+87
|\ \ \ \ | |/ / / |/| | |
| * | | TIF: Put comments for the newly added US and Canadian rating stringsJae Seo2015-03-171-0/+87
* | | | resolved conflicts for merge of 375e21f8 to mnc-dev-plus-aospMarco Nelissen2015-04-281-28/+48
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge "Sometimes the application context is null"Marco Nelissen2015-04-281-35/+55
| |\ \ \
| | * | | Sometimes the application context is nullMarco Nelissen2015-04-221-35/+55
| * | | | Merge "Revert "Sometimes the application context is null""Marco Nelissen2015-04-221-54/+34
| |\ \ \ \
| | * | | | Revert "Sometimes the application context is null"Marco Nelissen2015-04-221-54/+34
| * | | | | Merge "Sometimes the application context is null"Marco Nelissen2015-04-221-34/+54
| |\ \ \ \ \ | | |/ / / /
| | * | | | Sometimes the application context is nullMarco Nelissen2015-04-211-34/+54
| | |/ / /
* | | | | TIF: add new audio modes to the timeShiftSetPlaybackRate() javadoc.Dongwon Kang2015-04-283-0/+6
| |_|_|/ |/| | |
* | | | ImageWriter: Change detach to sp<GraphicBuffer>Dan Stoza2015-04-271-1/+1
* | | | Add near-ultrasound properties to AudioManager.javaArunesh Mishra2015-04-271-0/+17
* | | | Merge "Hide stretch mode from PlaybackSettings"Andy Hung2015-04-252-11/+6
|\ \ \ \
| * | | | Hide stretch mode from PlaybackSettingsAndy Hung2015-04-242-11/+6
* | | | | Merge "Move channel index computation to native AudioTrack JNI"Andy Hung2015-04-251-49/+2
|\ \ \ \ \ | |/ / / /
| * | | | Move channel index computation to native AudioTrack JNIAndy Hung2015-04-241-49/+2
* | | | | Merge "Unhide new channel masks and deprecate old channel masks"Andy Hung2015-04-241-8/+7
|\ \ \ \ \ | |/ / / /
| * | | | Unhide new channel masks and deprecate old channel masksAndy Hung2015-04-241-8/+7
* | | | | Merge "TIF: Add TvContentRating constant for unrated content"Jae Seo2015-04-241-0/+6
|\ \ \ \ \
| * | | | | TIF: Add TvContentRating constant for unrated contentJae Seo2015-04-231-0/+6
| |/ / / /
* | | | | Merge "Add AudioManager property strings for ultrasound."Arunesh Mishra2015-04-241-0/+14
|\ \ \ \ \
| * | | | | Add AudioManager property strings for ultrasound.Arunesh Mishra2015-04-241-0/+14