summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Expand)AuthorAgeFilesLines
* am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManage...Adam Lesinski2014-06-101-1/+1
|\
| * Allow for a NoOp implementation of DrmManagerClientImplAdam Lesinski2014-06-041-1/+1
* | Fix a few more stray libcore.io references.Elliott Hughes2014-04-281-1/+1
* | Move internal libcore.os users over to android.system.Elliott Hughes2014-04-281-3/+3
* | Update DrmOutputStream to use raw FileDescriptor.Jeff Sharkey2014-02-061-11/+22
* | am 38638b2f: am eaae9906: am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch...Narayan Kamath2014-01-292-15/+18
|\ \ | |/
| * AArch64: Use long for pointers in DRM classesAshok Bhat2014-01-172-15/+18
* | Remove unused imports from frameworks/base.John Spurlock2013-11-201-1/+0
* | Revert "Enhancement for OnInfo callback on DRM Framework"Jeff Tinker2013-09-032-70/+14
* | Enhancement for OnInfo callback on DRM FrameworkTakeshi Aimi2013-08-232-14/+70
|/
* Add liblogYing Wang2013-04-091-1/+1
* Move stream creation outside of DrmOutputStream.Jeff Sharkey2012-12-171-33/+34
* Move DRM to CloseGuard, add DrmOutputStream.Jeff Sharkey2012-12-132-9/+124
* am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-0714-0/+0
|\
| * Correct executable bit for source filesKenny Root2012-11-0714-0/+0
* | Merge "Let getOriginalMimeType() take a fd passed from drm java applications"...James Dong2012-08-222-7/+37
|\ \ | |/ |/|
| * Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-222-7/+37
* | Release JNI local references as soon as possible.Henrik B Andersson2012-08-172-49/+59
|/
* Fix an issue where the message queue fails to queue in the looper threads bec...James Dong2012-05-071-15/+17
* frameworks base Android.mk file changesJames Dong2012-03-281-3/+3
* Deleted the media, camera, drm related files since they are relocatedJames Dong2012-03-2860-12411/+0
* Merge "make sure that lower-case mime and file suffix is used to check agains...James Dong2012-03-141-5/+8
|\
| * make sure that lower-case mime and file suffix is used to check against the s...James Dong2012-03-131-5/+8
* | Merge "Fixed a buffer overflow bug in DrmPassthruPlugin"James Dong2012-03-141-2/+8
|\ \
| * | Fixed a buffer overflow bug in DrmPassthruPluginJames Dong2012-03-131-2/+8
| |/
* | Turned off log spamming from DrmPassthruPluginJames Dong2012-03-131-28/+28
|/
* Merge "Avoid checking supported mime types or file suffixes in multiple places"James Dong2012-03-123-53/+55
|\
| * Avoid checking supported mime types or file suffixes in multiple placesJames Dong2012-03-093-53/+55
* | Added an failure log message when the fwdlock engine fails to open a given file.James Dong2012-03-091-1/+8
|/
* There was copy and paste code in JNI to create a DrmConvertedStatus object.James Dong2012-03-051-40/+25
* Fix some JNI issues in the drm frameworkJames Dong2012-03-021-30/+9
* Merge "Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes"James Dong2012-03-023-47/+136
|\
| * Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classesJames Dong2012-03-013-47/+136
* | am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug f...Jean-Baptiste Queru2012-03-012-27/+85
|\ \
| * | DRM framwork bug fix: add an API to release resourcesKei Takahashi2012-02-292-27/+85
| * | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-193-14/+14
| * | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-191-2/+2
| * | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-191-1/+1
| * | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-192-28/+28
| * | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-196-138/+138
* | | Added permission check for all sensitive drm API callsJames Dong2012-02-281-0/+21
| |/ |/|
* | Merge "Fix API issues in DrmRights class."James Dong2012-02-281-33/+22
|\ \
| * | Fix API issues in DrmRights class.James Dong2012-02-271-33/+22
* | | Merge "Deprecate default constructor for classes that should have been meant ...James Dong2012-02-281-0/+30
|\ \ \
| * | | Deprecate default constructor for classes that should have been meant to be i...James Dong2012-02-271-0/+30
| |/ /
* | | Merge "Remove unnecessary header file includes for drmserver"James Dong2012-02-281-5/+0
|\ \ \
| * | | Remove unnecessary header file includes for drmserverJames Dong2012-02-271-5/+0
| |/ /
* | | Merge "Added missing javadoc comment for public API in DrmUtils class"James Dong2012-02-281-5/+25
|\ \ \
| * | | Added missing javadoc comment for public API in DrmUtils classJames Dong2012-02-271-5/+25
| |/ /
* | | Deprecated a mis-spelled method and replaced it with a new methodJames Dong2012-02-271-0/+11
|/ /