summaryrefslogtreecommitdiff
path: root/drm
AgeCommit message (Collapse)Author
2012-03-13Fixed a buffer overflow bug in DrmPassthruPluginJames Dong
Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
2012-03-13Turned off log spamming from DrmPassthruPluginJames Dong
Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
2012-03-13make sure that lower-case mime and file suffix is used to check against the ↵James Dong
supported ones Change-Id: I6a20832f6a2dfb8554dbddef0dee87cc21c05c80
2012-03-12Merge "Avoid checking supported mime types or file suffixes in multiple places"James Dong
2012-03-09Avoid checking supported mime types or file suffixes in multiple placesJames Dong
Change-Id: I47d24070c7bda385cd1d7fa1f6a75dbb1f82b476
2012-03-09Added an failure log message when the fwdlock engine fails to open a given file.James Dong
Change-Id: I0e7f60b61f03fde046fc1ad668b28cdee635898b
2012-03-05There was copy and paste code in JNI to create a DrmConvertedStatus object.James Dong
o This patch removed duplicated code. Change-Id: Ic3d3461fb8da6fab1b4d19d28b8d9d4abc8a53b1
2012-03-02Fix some JNI issues in the drm frameworkJames Dong
o allocated array using new must be deleted using delete[] o removed duplicated code Change-Id: Ifa8e2e1cd46568c5266717eb1ad340b61a843adc
2012-03-02Merge "Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes"James Dong
2012-03-01am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug ↵Jean-Baptiste Queru
fix: add an API to release resources" * commit 'f73222a39e0fa294d9105fd7464943aed6e77cd7': DRM framwork bug fix: add an API to release resources
2012-03-01Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classesJames Dong
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
2012-02-29DRM framwork bug fix: add an API to release resourcesKei Takahashi
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
2012-02-28Added permission check for all sensitive drm API callsJames Dong
o all drm calls using a DecryptHandle now check the permission before proceeding Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
2012-02-28Merge "Fix API issues in DrmRights class."James Dong
2012-02-28Merge "Deprecate default constructor for classes that should have been meant ↵James Dong
to be interfaces"
2012-02-28Merge "Remove unnecessary header file includes for drmserver"James Dong
2012-02-28Merge "Added missing javadoc comment for public API in DrmUtils class"James Dong
2012-02-27Added missing javadoc comment for public API in DrmUtils classJames Dong
o also fixed mis-spelled private method name (quiteDispose => quietlyDispose) Change-Id: I692cd7471eac547b849dd53853f60843b3915750
2012-02-27Remove unnecessary header file includes for drmserverJames Dong
Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
2012-02-27Fix API issues in DrmRights class.James Dong
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
2012-02-27Deprecated a mis-spelled method and replaced it with a new methodJames Dong
Change-Id: Id049a4effab120c3f837cde60a87efcd89a64ec6
2012-02-27Deprecate default constructor for classes that should have been meant to be ↵James Dong
interfaces o We should have not exposed these default constructors in the first place. Change-Id: Ia8bcfe77e9730021ad8870ece67c6d0eed8146ad
2012-02-24Merge "Improved comment about DrmStore.ConstraintsColumns"James Dong
2012-02-24Only allow valid types to be used in DrmErrorEvent and DrmInfoEventJames Dong
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
2012-02-23Improved comment about DrmStore.ConstraintsColumnsJames Dong
Change-Id: I89c588759dd409ac0252d686af12bfe4e105f3d5
2012-02-15Added checks for illegal argumentsJames Dong
Change-Id: Ib386c33b7e2cab12cabbb9dc023d54df05472960
2012-01-19Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
2012-01-19Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
2012-01-19Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)Steve Block
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
2012-01-19Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)Steve Block
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
2012-01-19Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
2012-01-12Separate sniffing from session initializationJames Dong
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
2012-01-08Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
2012-01-06Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
2012-01-03Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
2011-12-14am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead ↵James Dong
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.
2011-12-14Revert the following patches because they may lead to power regression ↵James Dong
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
2011-12-12am f14dc291: Merge from ics-mr1The Android Open Source Project
* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1': Fix drm enumeration order, resolves failure to play forward lock ringtones
2011-12-09Fix drm enumeration order, resolves failure to play forward lock ringtonesJeff Tinker
Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9 related-to-bug: 5735466
2011-11-10Fix log messageGlenn Kasten
Log did not have a tag, and was wrong level Change-Id: I8d12895c80483e1e39f117a393b8be2f4bdd3e1d
2011-10-26Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
2011-09-21Modified loadPlugIns to load from /vendor and /system; skip libraries that ↵Edwin Wong
are already loaded. BUG: 5284436 Change-Id: I99267c81a488860c3c7edb747100d44f3083bfc2
2011-08-04resolved conflicts for merge of 845fdba7 to masterGloria Wang
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
2011-08-04am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 ↵Gloria Wang
Forward Lock Agent" * commit '8a6fb50d69ec40a413b117bc9145a97ec427852f': Bug fixes in OMA DRM v1 Forward Lock Agent
2011-08-04Bug fixes in OMA DRM v1 Forward Lock AgentHenrik B Andersson
A couple of fixes in the Forward Lock Agent. The DRM Framework isn't thread safe so the Forward Lock Agent needs to protect the private structures. Base64-encoded content with LF-only instead of CRLF line breaks is now accepted. A fix for non-standard boundary characters. The debug prints are also turned off as default. Change-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f
2011-08-01Fix ordering assumption of argument evaluation.Gloria Wang
No specific order is specified in the C++ standard, but the order of the calls to Parcel read commands matters. Move any calls with multiple reads to local variables. Fix for bug 5103507. Change-Id: Ic23ad50ec5f443146f00324b66d5e2bd5b9ffd0d
2011-07-25Fix for bug 4371230.Gloria Wang
- Generate unique ID for each DrmManagerClient in native side - Fix the bug where multiple clients could use the same ID - Return the correct unique ID back to Java - Add a flag in the unique ID to separate native client and Java client Change-Id: Ia4574b6b0a526f2335a65380975dc62f9a6e7f9b
2011-07-11Remove the simulator target from all makefiles.Jeff Brown
Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
2011-06-22- Add two sanity checks.Gloria Wang
- Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle. Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
2011-06-21Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."Gloria Wang
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 03:36:05 +0000