summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Expand)AuthorAgeFilesLines
* Remove unused MediaPlayer methodsMarco Nelissen2013-06-131-44/+0
* am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate ...Andreas Huber2013-06-031-1/+63
|\
| * Listen for HTTP proxy changes and propagate the information to the mediaAndreas Huber2013-05-311-1/+63
* | am eaa9ce70: am 606ab470: Merge "Improve exception error messages to help dia...Jeff Tinker2013-05-221-32/+70
|\ \ | |/
| * Merge "Improve exception error messages to help diagnose app errors" into jb-...Jeff Tinker2013-05-221-32/+70
| |\
| | * Improve exception error messages to help diagnose app errorsJeff Tinker2013-05-211-32/+70
* | | am 09d6ad37: am 2161b7cb: Merge "Fix invalid keyType translation in MediaDrm....Jeff Tinker2013-05-221-5/+29
|\ \ \ | |/ /
| * | Fix invalid keyType translation in MediaDrm.getKeyRequestJeff Tinker2013-05-211-5/+29
| |/
* | am 9ba564c7: am 48f2b548: Merge "MediaDrm API: Add two exceptions to handle e...Jeff Tinker2013-05-011-7/+8
|\ \ | |/
| * Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into ...Jeff Tinker2013-05-011-7/+8
| |\
| | * MediaDrm API: Add two exceptions to handle error path scenariosJeff Tinker2013-04-301-7/+8
* | | am 94264d52: am 2f4cc8ea: Merge "Fix a crash case" into jb-mr2-devMike J. Chen2013-05-011-5/+6
|\ \ \ | |/ /
| * | Fix a crash caseMike J. Chen2013-04-261-5/+6
| |/
* | am a393c2a2: am c884a08e: Merge "Improve error handling for DRM errors report...Jeff Tinker2013-04-181-0/+53
|\ \ | |/
| * Improve error handling for DRM errors reported by pluginsJeff Tinker2013-04-171-0/+53
* | am 4efe71ae: am 45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-devJeff Tinker2013-04-181-8/+8
|\ \ | |/
| * Make MediaDrm APIs publicJeff Tinker2013-04-171-8/+8
* | resolved conflicts for merge of a976bddd to masterYing Wang2013-04-094-0/+4
|\ \ | |/
| * Add liblogYing Wang2013-04-094-0/+4
* | am d563cede: am c4ad3cb0: Merge "Add support for common encryption" into jb-m...Marco Nelissen2013-04-083-3/+40
|\ \ | |/
| * Merge "Add support for common encryption" into jb-mr2-devMarco Nelissen2013-04-083-3/+40
| |\
| | * Add support for common encryptionMarco Nelissen2013-04-083-3/+40
* | | am 72e2307c: am 1e0f36cf: Merge "Implement async event callout from drm plugi...Jeff Tinker2013-04-042-5/+159
|\ \ \ | |/ /
| * | Merge "Implement async event callout from drm plugin to Java app" into jb-mr2...Jeff Tinker2013-04-052-5/+159
| |\ \
| | * | Implement async event callout from drm plugin to Java appJeff Tinker2013-04-032-5/+159
* | | | Phase 1 of refactoring SystemServer.Dan Morrill2013-04-042-49/+49
|/ / /
* | | Merge "MediaDrm API update" into jb-mr2-devJeff Tinker2013-04-021-37/+243
|\ \ \ | |/ / | | / | |/ |/|
| * MediaDrm API updateJeff Tinker2013-04-011-37/+243
* | MTP: Implement date created field in GetObjectInfoMike Lockwood2013-04-011-1/+2
|/
* Load crypto plugins from additional shared librariesJeff Tinker2013-03-221-1/+1
* Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-devztenghui2013-03-201-0/+21
|\
| * Add the orientation hint to the MediaMuxerztenghui2013-03-191-0/+21
* | Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-204-0/+878
|\ \ | |/ |/|
| * Implementing MediaDrm APIsJeff Tinker2013-03-134-0/+878
* | remove uses of Surface in favor of IGraphicBufferProducerMathias Agopian2013-03-121-1/+1
|/
* Java API for MediaMuxerztenghui2013-03-113-0/+240
* fix JNI use of incStrong/decStrongMathias Agopian2013-03-061-4/+4
* Implement Surface input to MediaCodec.Andy McFadden2013-03-042-0/+57
* Camera and MediaRecorder: Support AppOpsEino-Ville Talvala2013-02-251-2/+13
* Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-153-7/+6
* Surface doens't have an identity anymoreMathias Agopian2013-02-141-1/+1
* split Surface in two classes: SurfaceControl and SurfaceMathias Agopian2013-02-142-59/+8
* am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local f...Marco Nelissen2013-02-121-5/+48
|\
| * Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""Marco Nelissen2013-02-121-5/+48
| |\
| | * Revert "use utf8_length() instead of local function, isValidUtf8()"Marco Nelissen2013-02-121-5/+48
* | | am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberE...James Dong2012-12-281-2/+5
|\ \ \ | |/ /
| * | Merge "Handle errors from AudioEffect::queryNumberEffects"James Dong2012-12-211-2/+5
| |\ \
| | * | Handle errors from AudioEffect::queryNumberEffectsPeter Karlsson2012-11-161-2/+5
* | | | Merge "Don't create weird ByteBuffers"Marco Nelissen2012-12-191-2/+17
|\ \ \ \
| * | | | Don't create weird ByteBuffersMarco Nelissen2012-12-191-2/+17
generated by cgit v1.1 at 2025-01-27 12:53:08 +0000