summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | Merge "Improved comment about DrmStore.ConstraintsColumns"James Dong2012-02-242-6/+27
|\ \
| * | Improved comment about DrmStore.ConstraintsColumnsJames Dong2012-02-232-6/+27
* | | Only allow valid types to be used in DrmErrorEvent and DrmInfoEventJames Dong2012-02-243-8/+66
|/ /
* | Added checks for illegal argumentsJames Dong2012-02-154-4/+40
* | Separate sniffing from session initializationJames Dong2012-01-1212-41/+141
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-083-14/+14
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-2/+2
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-032-28/+28
* | am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ...James Dong2011-12-141-3/+2
|\ \ | |/
| * Revert the following patches because they may lead to power regression becaus...James Dong2011-12-141-3/+2
* | am f14dc291: Merge from ics-mr1The Android Open Source Project2011-12-121-2/+3
|\ \ | |/
| * Fix drm enumeration order, resolves failure to play forward lock ringtonesJeff Tinker2011-12-091-2/+3
* | Fix log messageGlenn Kasten2011-11-101-1/+4
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-266-138/+138
|/
* Modified loadPlugIns to load from /vendor and /system; skip libraries that ar...Edwin Wong2011-09-211-9/+15
* resolved conflicts for merge of 845fdba7 to masterGloria Wang2011-08-046-183/+257
|\
| * am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward...Gloria Wang2011-08-046-183/+257
| |\
| | * Bug fixes in OMA DRM v1 Forward Lock AgentHenrik B Andersson2011-08-046-183/+257