summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/Drm.cpp
Commit message (Collapse)AuthorAgeFilesLines
* libmediaplayerservice: unlock before trying to reclaim drm session.Ronghua Wu2015-05-131-0/+11
| | | | | Bug: 21086224 Change-Id: Icebd8eab70570e818ff7f5fc3a32e1801c3b92d2
* Lock drm plugin API calls globally, not per MediaDrm instanceJeff Tinker2015-04-221-0/+1
| | | | | | Change-Id: I062c662a440a1becccd248c3b8ddf711c51e53cc related-to-bug: 18394494 related-to-bug: 19664283
* libmediaplayerservice: fix warnings, make warnings errors, use clangLajos Molnar2015-04-171-2/+2
| | | | Change-Id: I1b2f6b65c5abbc366068a60b8909104f31b94228
* Add expiration update and keys change eventsJeff Tinker2015-04-091-12/+54
| | | | | | | | In support of unprefixed EME bug: 19771612 bug: 19771431 Change-Id: Ib19d4c8db25f5b09f9a30ebd4992b668cad9bfc4
* Report key request message type for unprefixed EMEJeff Tinker2015-03-161-2/+4
| | | | | bug: 19771299 Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
* drm: use DrmSessionManager for session resource managing.Ronghua Wu2015-03-061-2/+72
| | | | | Bug: 19265536 Change-Id: Ie35184f99c51e7bd94d7c826ffb8e89040a81905
* am efd33e8d: am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" ↵Jeff Tinker2014-11-181-1/+5
|\ | | | | | | | | | | | | into lmp-mr1-dev * commit 'efd33e8da29243b6bddf3f787034960b0717de90': Fix missing mutex lock in Drm::binderDied
| * Fix missing mutex lock in Drm::binderDiedJeff Tinker2014-11-161-1/+5
| | | | | | | | | | bug: 18194977 Change-Id: Ie6107a34237577c3b9cc6507d507f5c51f49fcf6
* | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-171-2/+2
|\ \ | |/ |/| | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| * Update calls to IInterface::asBinder()Marco Nelissen2014-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | Add missing secure stop methodsJeff Tinker2014-10-311-0/+28
|/ | | | | | | b/18053197 b/18076411 Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
* Allow device to be unprovisionedJeff Tinker2014-08-011-0/+17
| | | | | bug: 12247651 Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
* Add signature|system permission to MediaDrm signer APIsJeff Tinker2014-04-021-0/+16
| | | | | Change-Id: If970e5ff8dcab2e67af2f3376dcd14dca82f2394 related-to-bug: 12702350
* Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-291-4/+26
| | | | | | | | | | Java API version Update frameworks to enable support for CAST V2 Authentication in the DRM Plugin. Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861 related-to-bug: 12702350
* fix MediaDrm.isCryptoSchemeSupported(uuid)Jeff Tinker2013-08-281-1/+5
| | | | | | | | | 1. Don't expect plugins to support an empty mimeType in isContentTypeSupported 2. Move the cts test mock drm plugin to the cts tree so it is always used b/10528466 Change-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1
* Add ability to test supported content types to MediaDrmJeff Tinker2013-08-221-5/+8
| | | | | bug: 10244066 Change-Id: I317f05b146db962c271893f6208890a5a6c396f1
* Part of fix for TEE resource leaks when app crashesJeff Tinker2013-07-031-0/+14
| | | | | bug: 9672606 Change-Id: I98cf65260d5e43d34e3897452f6f26ed2c89294e
* Implement async event callout from drm plugin to Java appJeff Tinker2013-04-031-1/+39
| | | | Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
* MediaDrm API updateJeff Tinker2013-04-011-15/+133
| | | | | | | | Clarify offline usage of sessions and keys and implement implement CryptoSession to support additional crypto use cases. Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
* Implementing MediaDrm APIsJeff Tinker2013-03-131-0/+423
Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6