summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Collapse)AuthorAgeFilesLines
* Correct executable bit for source filesKenny Root2013-04-1314-0/+0
| | | | | | | | | | Many media files and source code files were marked as executable in Git. Remove those. Also a shell script and python script were not marked as executable. Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5 Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
* Merge "Let getOriginalMimeType() take a fd passed from drm java ↵James Dong2012-08-222-7/+37
|\ | | | | | | applications" into jb-mr1-dev
| * Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-222-7/+37
| | | | | | | | | | | | | | | | | | | | At present, we did not actually pass the fd. This patch allows us to make the changes necessary in the future without worrying too much about broken build. related-to-bug: 6426185 Change-Id: I125decff9be621a72f2631fd439994a94a526606
* | Release JNI local references as soon as possible.Henrik B Andersson2012-08-172-49/+59
|/ | | | | | | | The JNI layer has a fix amount (512) of jni references. They should be released as soon as possible. In for and while loops they can quickly reach the limit. Change-Id: Id984345e1cc4f7aa6eb31a263b796c3da9edf773
* Fix an issue where the message queue fails to queue in the looper threads ↵James Dong2012-05-071-15/+17
| | | | | | | | because they are not created. o related-to-bug: 6293875 Change-Id: I03dbb2782bd90f88d1f8df086b8a529730afe5dc
* frameworks base Android.mk file changesJames Dong2012-03-281-3/+3
| | | | Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
* Deleted the media, camera, drm related files since they are relocatedJames Dong2012-03-2860-12411/+0
| | | | Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
* Merge "make sure that lower-case mime and file suffix is used to check ↵James Dong2012-03-141-5/+8
|\ | | | | | | against the supported ones"
| * make sure that lower-case mime and file suffix is used to check against the ↵James Dong2012-03-131-5/+8
| | | | | | | | | | | | supported ones Change-Id: I6a20832f6a2dfb8554dbddef0dee87cc21c05c80
* | 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
| |/ | | | | | | Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
* | Turned off log spamming from DrmPassthruPluginJames Dong2012-03-131-28/+28
|/ | | | Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
* 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
| | | | | | | | Change-Id: I47d24070c7bda385cd1d7fa1f6a75dbb1f82b476
* | Added an failure log message when the fwdlock engine fails to open a given file.James Dong2012-03-091-1/+8
|/ | | | Change-Id: I0e7f60b61f03fde046fc1ad668b28cdee635898b
* There was copy and paste code in JNI to create a DrmConvertedStatus object.James Dong2012-03-051-40/+25
| | | | | | o This patch removed duplicated code. Change-Id: Ic3d3461fb8da6fab1b4d19d28b8d9d4abc8a53b1
* Fix some JNI issues in the drm frameworkJames Dong2012-03-021-30/+9
| | | | | | | o allocated array using new must be deleted using delete[] o removed duplicated code Change-Id: Ifa8e2e1cd46568c5266717eb1ad340b61a843adc
* 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
| | | | | | | | | | | | | | | | | | | | o added missing javadoc comment for some public fields o added checks for arguments o DrmSupportInfo should have not been exposed as public. A default package access modifier appears to be more proper but we may not be able to change the modifier. Change-Id: I5b284c17219c5121f241ee2934fb3e859ce7c827
* | am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug ↵Jean-Baptiste Queru2012-03-012-27/+85
|\ \ | | | | | | | | | | | | | | | | | | fix: add an API to release resources" * commit 'f73222a39e0fa294d9105fd7464943aed6e77cd7': DRM framwork bug fix: add an API to release resources
| * | DRM framwork bug fix: add an API to release resourcesKei Takahashi2012-02-292-27/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When DrmManagerClient object is created and released many times, the process suddenly crashes. The case can happen when we make many thumbnails of DRM-encrypted contents. The problem is caused by shortage of file descriptors. DrmManagerClient releases references of file descriptors only when GC runs. So file descriptors are kept long time even after the reference of DrmManagerClient are released. By introducing DrmManagerClient#release() API, the problem is solved. An application call this API when we no longer need to use DrmManagerClient object. Changes are made by SEMC and Sony. Change-Id: Ie0bbc29cc33872449824285a8d67b1c3cdd8082b
| * | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-193-14/+14
| | | | | | | | | | | | Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
| * | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-191-2/+2
| | | | | | | | | | | | Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
| * | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block2012-01-191-1/+1
| | | | | | | | | | | | Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
| * | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block2012-01-192-28/+28
| | | | | | | | | | | | Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
| * | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-196-138/+138
| | | | | | | | | | | | Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
* | | Added permission check for all sensitive drm API callsJames Dong2012-02-281-0/+21
| |/ |/| | | | | | | | | o all drm calls using a DecryptHandle now check the permission before proceeding Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | o account id and subscription id are not mandatory, and thus can be anything such as null or an empty string. o removed unnecessary or thus inconsistent checks for account id and subscription id o updated the javadoc to specify that mimeType could not be null or an empty string. Change-Id: I704f1dd7fc5d33060da908aae0469d560c7db036
* | | Merge "Deprecate default constructor for classes that should have been meant ↵James Dong2012-02-281-0/+30
|\ \ \ | | | | | | | | | | | | to be interfaces"
| * | | Deprecate default constructor for classes that should have been meant to be ↵James Dong2012-02-271-0/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | interfaces o We should have not exposed these default constructors in the first place. Change-Id: Ia8bcfe77e9730021ad8870ece67c6d0eed8146ad
* | | 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
| |/ / | | | | | | | | | Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
* | | 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
| |/ / | | | | | | | | | | | | | | | o also fixed mis-spelled private method name (quiteDispose => quietlyDispose) Change-Id: I692cd7471eac547b849dd53853f60843b3915750
* | | Deprecated a mis-spelled method and replaced it with a new methodJames Dong2012-02-271-0/+11
|/ / | | | | | | Change-Id: Id049a4effab120c3f837cde60a87efcd89a64ec6
* | Merge "Improved comment about DrmStore.ConstraintsColumns"James Dong2012-02-242-6/+27
|\ \
| * | Improved comment about DrmStore.ConstraintsColumnsJames Dong2012-02-232-6/+27
| | | | | | | | | | | | Change-Id: I89c588759dd409ac0252d686af12bfe4e105f3d5
* | | Only allow valid types to be used in DrmErrorEvent and DrmInfoEventJames Dong2012-02-243-8/+66
|/ / | | | | | | | | | | | | | | | | o This patch will prevent applications from abusing the API by using arbitrary int value for DrmErrorEvent or DrmInfoEvent types. o We should have not defined some type constants in the super/base class, DrmEvent. Change-Id: Id0bb12caa8ce471cb6951cc2b5d37ea408f90063
* | Added checks for illegal argumentsJames Dong2012-02-154-4/+40
| | | | | | | | Change-Id: Ib386c33b7e2cab12cabbb9dc023d54df05472960
* | Separate sniffing from session initializationJames Dong2012-01-1212-41/+141
| | | | | | | | | | | | | | | | | | | | | | | | This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened o The change is backward compatibile in that no update is required for existing drm plug-ins if they do not plan to provide separate sniffer/extractor related-to-bug: 5725548 Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-083-14/+14
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-2/+2
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
* | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-032-28/+28
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* | am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ↵James Dong2011-12-141-3/+2
|\ \ | |/ | | | | | | | | | | to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. * commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec': Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
| * Revert the following patches because they may lead to power regression ↵James Dong2011-12-141-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b. 2. Revert "Fixed the false drm recognition." This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230. 3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones" This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369. 4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long." This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9. As a result of the reverting, many ANRs from WV sniffing are back. related-to-bug: 5739618
* | am f14dc291: Merge from ics-mr1The Android Open Source Project2011-12-121-2/+3
|\ \ | |/ | | | | | | * commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1': Fix drm enumeration order, resolves failure to play forward lock ringtones
| * Fix drm enumeration order, resolves failure to play forward lock ringtonesJeff Tinker2011-12-091-2/+3
| | | | | | | | | | Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9 related-to-bug: 5735466
* | Fix log messageGlenn Kasten2011-11-101-1/+4
| | | | | | | | | | | | Log did not have a tag, and was wrong level Change-Id: I8d12895c80483e1e39f117a393b8be2f4bdd3e1d
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-266-138/+138
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
generated by cgit v1.1 at 2024-05-07 04:08:21 +0000