summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Make MediaPlayer fail fast on UnknownServiceException.Alex Klyubin2015-04-201-1/+5
|/
* Merge "Frameworks/base: Use equals for Integer comparison"Andreas Gampe2015-03-163-5/+7
|\
| * Frameworks/base: Use equals for Integer comparisonAndreas Gampe2015-03-153-5/+7
* | Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"Jeff Tinker2015-03-131-4/+16
|\ \ | |/ |/|
| * Handle NULL keys and NULL values in MediaDrm JNI HashMapDaniel Broms2014-11-241-4/+16
* | Fix context leakMarco Nelissen2015-03-111-35/+44
* | am 3d333c74: Merge "Fix typos in AudioManager javadoc"Narayan Kamath2015-03-101-1/+1
|\ \
| * | Fix typos in AudioManager javadocEemi Haukkala2015-03-101-1/+1
* | | am 6da3cc59: am 396f131d: Merge "Fix memory leak"Marco Nelissen2015-02-111-0/+1
|\ \ \ | |/ /
| * | Fix memory leakMarco Nelissen2015-02-101-0/+1
* | | am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-devChong Zhang2015-02-061-1/+1
|\ \ \
| * \ \ Merge "reset col position to 1 on row PAC" into lmp-mr1-devChong Zhang2015-02-061-1/+1
| |\ \ \
| | * | | reset col position to 1 on row PACChong Zhang2015-02-051-1/+1
* | | | | am b2d7ca7c: am fd2c1307: Merge "Fix build."Elliott Hughes2015-02-041-4/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix build.Elliott Hughes2015-02-041-4/+4
* | | | | am 015fdf39: Merge "audio: allow audio port cache update even when audio patc...Wonsik Kim2015-02-031-7/+24
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | audio: allow audio port cache update even when audio patches contain invalida...Wonsik Kim2015-01-311-7/+24
| | |/ / | |/| |
* | | | Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-...Lajos Molnar2015-01-292-10/+20
|\ \ \ \ | |/ / /
| * | | ImageReader: add support for compatible flexYUV buffersLajos Molnar2015-01-282-10/+20
* | | | am 4b1e5814: am 71191442: TIF: Do not call session callbacks when the session...Jae Seo2015-01-291-9/+27
|\ \ \ \ | |/ / /
| * | | TIF: Do not call session callbacks when the session is already releasedJae Seo2015-01-281-9/+27
* | | | am 3ea395dd: am 4e853598: Merge "Fix printf format"Marco Nelissen2015-01-271-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Fix printf formatMarco Nelissen2015-01-271-2/+2
* | | | am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"Marco Nelissen2015-01-277-28/+1470
|\ \ \ \ | |/ / /
| * | | Merge "Make SoundPool use MediaCodec"Marco Nelissen2015-01-277-28/+1470
| |\ \ \
| | * | | Make SoundPool use MediaCodecMarco Nelissen2015-01-237-28/+1470
* | | | | am 46c3304a: am 485813a0: Merge "Delay the second message for 30ms more than ...Matthew Xie2015-01-271-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Delay the second message for 30ms more than the last message for a2dp"...Matthew Xie2015-01-271-1/+1
| |\ \ \ \
| | * | | | Delay the second message for 30ms more than the last message for a2dpMatthew Xie2015-01-221-1/+1
* | | | | | am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new aud...Mike Lockwood2015-01-263-39/+56
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MTP: Fix partial implementation of 5 new audio specific propertiesMike Lockwood2015-01-233-39/+56
| |/ / / /
* | | | | Merge "Add missing <string.h> includes." automerge: 82a1a2cElliott Hughes2015-01-253-0/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add missing <string.h> includes.Elliott Hughes2015-01-253-0/+3
| | |/ / | |/| |
* | | | 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