summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Expand)AuthorAgeFilesLines
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-1018-51/+44
* Remove some unused forward lock codeJames Dong2012-08-082-61/+0
* am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ...James Dong2012-06-1312-0/+1140
|\
| * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-1312-0/+1140
* | Add a new API on DRM Framework for streamingKei Takahashi2012-05-2312-0/+162
|/
* Support widevine:// URLs in NuMediaExtractor / java MediaExtractor.Andreas Huber2012-04-171-15/+1
* You don't need LOCAL_SHARED_LIBRARIES/LOCAL_STATIC_LIBRARIES to build a stati...Ying Wang2012-04-091-7/+0
* Removed unnecessary include JNI from two drm Android.mk filesJames Dong2012-03-282-2/+0
* AV Android make files changesJames Dong2012-03-288-20/+16
* 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
|/
* Added permission check for all sensitive drm API callsJames Dong2012-02-281-0/+21
* Remove unnecessary header file includes for drmserverJames Dong2012-02-271-5/+0
* Separate sniffing from session initializationJames Dong2012-01-1212-41/+141
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-082-13/+13
* 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-265-100/+100
|/
* 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
* | | Fix ordering assumption of argument evaluation.Gloria Wang2011-08-011-21/+45
* | | Fix for bug 4371230.Gloria Wang2011-07-2510-40/+53
* | | Remove the simulator target from all makefiles.Jeff Brown2011-07-113-22/+6
* | | - Add two sanity checks.Gloria Wang2011-06-223-1/+5
* | | Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."Gloria Wang2011-06-211-0/+13
|\ \ \
| * | | Fix a memory leak in the Forward Lock plugin.Gloria Wang2011-06-211-0/+13
* | | | Merge "-Fix some typo -Remove one unnecessary memory allocation"Gloria Wang2011-06-162-17/+15
|\ \ \ \ | |/ / / |/| | |
| * | | -Fix some typoGloria Wang2011-06-152-17/+15
* | | | To remove log spam in the Forward Lock DRM plugin.Gloria Wang2011-06-141-30/+30
|/ / /
* | | Duplicated fileDesc is not closed when input file is not forward-lock content.Gloria Wang2011-06-131-1/+4
* | | Fix memory leak from retrieval of getSupportedDrmInfo.James Dong2011-04-241-0/+2
* | | am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the...Gloria Wang2011-03-251-1/+0
|\ \ \ | |/ /
| * | Fix for bug 4126624.Gloria Wang2011-03-241-1/+0
| * | Fix for bug 4165823.Gloria Wang2011-03-242-10/+34
* | | Merge "Include strings.h for the strcasecmp prototype."Carl Shapiro2011-03-221-1/+1
|\ \ \
| * | | Include strings.h for the strcasecmp prototype.Carl Shapiro2011-03-221-1/+1
* | | | am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHa...Gloria Wang2011-03-221-2/+17
|\ \ \ \ | |/ / / |/| / / | |/ /