summaryrefslogtreecommitdiffstats
path: root/media/jni/android_media_MediaDrm.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-4/+4
| | | | | | | | Also addresses style issues noted in post-submit review from https://googleplex-android-review.git.corp.google.com/#/c/439054/ Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5 related-to-bug: 12702350
* Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-17/+109
| | | | | | | | | | Java API version Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a related-to-bug: 12702350
* Merge "Fix a JNI local reference leak in MediaDrm"Jason Sams2014-01-111-0/+1
|\
| * Fix a JNI local reference leak in MediaDrmPatrik2 Carlsson2013-12-191-0/+1
| | | | | | | | | | | | | | | | A reference leak was found in the subtitle usecase that also applies to android_media_MediaDrm.cpp (Code taken from the similar fix in android_media_MediaPlayer.cpp) Change-Id: Icc4b25e4adc9a600ff4ac99a7a8478bb55a6e348
* | MediaDrm#mNativeContext is a long, not int.Narayan Kamath2013-12-181-1/+1
|/ | | | | | Therefore, we must use SetLongField and not SetIntField. Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
* AArch64: Use long for pointers in MediaDrm and MediaMuxerAshok Bhat2013-12-101-3/+3
| | | | | | | | For storing pointers, long is used in MediaDrm and MediaMuxer classes, as native pointers can be 64-bit. Change-Id: I77f26cde627baf0dce70b6aa3a4dbd974051d9a6 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* Remove dependency on JNIHelp header side effects.Ruben Brunk2013-09-101-0/+1
| | | | | Bug: 10680559 Change-Id: I47870d6c48906e0a420c52b7bc5945ffe29c68a2
* Add ability to test supported content types to MediaDrmJeff Tinker2013-08-211-5/+10
| | | | | bug: 10244066 Change-Id: Ic96c2e23f36809faf1c88ede500f4bc2bad4142a
* Fix JNI method called with exception pendingJeff Tinker2013-08-161-4/+12
| | | | | bug: 10313912 Change-Id: I8390905334f2e37f210adced52c31e7a431d4f55
* Define error codes for MediaCodec.CryptoExceptionJeff Tinker2013-08-031-0/+3
| | | | | | | | | | | Define specific failure cases so apps have the information they need to deal with these conditions. Also adds a new ResourceBusyException to MediaDrm Change-Id: Iaecf269d58108f28179974b05671bf29b9fe4b7d related-to-bug: 10157154 related-to-bug: 9695816
* Merge "Improve exception error messages to help diagnose app errors" into ↵Jeff Tinker2013-05-221-32/+70
|\ | | | | | | jb-mr2-dev
| * Improve exception error messages to help diagnose app errorsJeff Tinker2013-05-211-32/+70
| | | | | | | | | | | | bug: 9072051 Change-Id: I45057951d1a62b1b4a996e85f01601239e1b7161
* | Fix invalid keyType translation in MediaDrm.getKeyRequestJeff Tinker2013-05-211-5/+29
|/ | | | | bug: 9070897 Change-Id: Ib9b4174e08b1c828d0204e0ab65bc3d7c2efcedf
* MediaDrm API: Add two exceptions to handle error path scenariosJeff Tinker2013-04-301-7/+8
| | | | | bug: 8725707 Change-Id: Ia00c495ac591cc2993f4d11ad3480b59833d009e
* Improve error handling for DRM errors reported by pluginsJeff Tinker2013-04-171-0/+53
| | | | | Change-Id: I25df78f16379b32c54189949daa3ab9c91187375 related-to-bug: 8621516
* Make MediaDrm APIs publicJeff Tinker2013-04-171-8/+8
| | | | | | bug: 8603279 Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
* Implement async event callout from drm plugin to Java appJeff Tinker2013-04-031-3/+142
| | | | Change-Id: I451b7c6f766aafac39ce432a71ef5a03bffe29f1
* MediaDrm API updateJeff Tinker2013-04-011-37/+243
| | | | | | | | Clarify offline usage of sessions and keys and implement implement CryptoSession to support additional crypto use cases. Change-Id: Id3f8c706e9e3034b09af8e2a6a2f26bd74a49f93
* Implementing MediaDrm APIsJeff Tinker2013-03-131-0/+817
Change-Id: Ib6eeb9c04c5c5cf1d485f9004cd3e6a1047a1d19