summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Collapse)AuthorAgeFilesLines
* Frameworks/base: Wall Werror in drmAndreas Gampe2014-11-102-4/+5
| | | | | | Turn on -Wall -Werror in drm/jni. Fix warnings. Change-Id: If24fec45fbb737af593ddadfa473548dfa583e0b
* am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of ↵Adam Lesinski2014-06-101-1/+1
|\ | | | | | | | | | | | | DrmManagerClientImpl" into klp-modular-dev * commit '5fed49f7d614ae9e83db04703484b31c8077b78c': Allow for a NoOp implementation of DrmManagerClientImpl
| * Allow for a NoOp implementation of DrmManagerClientImplAdam Lesinski2014-06-041-1/+1
| | | | | | | | Change-Id: I150b95790d5e6d3c0160637149f18f2194318de8
* | Fix a few more stray libcore.io references.Elliott Hughes2014-04-281-1/+1
| | | | | | | | Change-Id: Id328544bd3a382fec16507d0ae5b699fef44ebd7
* | Move internal libcore.os users over to android.system.Elliott Hughes2014-04-281-3/+3
| | | | | | | | Change-Id: I84e1ace19ba3b4e58d7bb24f3ecda1bdf5dc75a5
* | Update DrmOutputStream to use raw FileDescriptor.Jeff Sharkey2014-02-061-11/+22
| | | | | | | | | | | | | | | | | | | | | | This allows DownloadManager to use FDs, paving the way for downloading directly to content:// Uris. Also return flag indicating if deleteOlderFiles() actually deleted anything. Update tests to verify. Bug: 5287571 Change-Id: I2579e5e2113f31b2860d7b021bd61c91b6310963
* | am 38638b2f: am eaae9906: am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge ↵Narayan Kamath2014-01-292-15/+18
|\ \ | |/ | | | | | | | | | | "AArch64: Use long for pointers in DRM classes" * commit '38638b2fcc4aba428889d521d83762d716e32332': AArch64: Use long for pointers in DRM classes
| * AArch64: Use long for pointers in DRM classesAshok Bhat2014-01-172-15/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in DRM classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: I101b0ea19ed93651c6ad1a9fa55e14e8be117469 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
* | Remove unused imports from frameworks/base.John Spurlock2013-11-201-1/+0
| | | | | | | | Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
* | Revert "Enhancement for OnInfo callback on DRM Framework"Jeff Tinker2013-09-032-70/+14
| | | | | | | | | | | | | | | | | | This reverts commit 6fd97b7d93c5eeaefb2695786b35d1672c88b0cf. Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video bug: 10542864 Change-Id: I85b84d6b602079571be1a7237c907716db9cdf54
* | Enhancement for OnInfo callback on DRM FrameworkTakeshi Aimi2013-08-232-14/+70
|/ | | | | | | | | | | | | | | In DRM framework, plugins can transmit DrmInfoEvent to Java layer. Although DrmInfoEvent has several entries, current implementation can only convey integer and String. This change enables plugins uto propagate a hashmap to Java layer. The hashmap can have one or more Strings and one byte array as value. Changes are made by Sony Corporation. bug: 10459159 Change-Id: I5f2bfb43b676863ef4d220fd4ef1e48777e92752 (cherry picked from commit 84a5b5cab40711e20ba70c5ed4dfeab6b558b53b)
* Add liblogYing Wang2013-04-091-1/+1
| | | | | Bug: 8580410 Change-Id: I746aa8258866508c3a725d0773faf4518096548f
* Move stream creation outside of DrmOutputStream.Jeff Sharkey2012-12-171-33/+34
| | | | | | | | More closely matches the object ownership pattern used by other stream APIs. Callers must now explicitly finish(). Also fixes write(int) bug by switching to Streams API. Change-Id: I64f9c5887ef02496b1ce4e97ce6af5dad93b4be2
* Move DRM to CloseGuard, add DrmOutputStream.Jeff Sharkey2012-12-132-9/+124
| | | | | | | | | Switch DrmManagerClient to using CloseGuard to better track leaked resources. Add DrmOutputStream which applies DRM transformation as data is written, similar to FilterOutputStream. Also writes DRM headers before closing. Change-Id: Ic106a3e6f6ff666e4dda484fbd234a0849eec8c0
* am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-0714-0/+0
|\ | | | | | | | | * commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04': Correct executable bit for source files
| * Correct executable bit for source filesKenny Root2012-11-0714-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
* | 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
generated by cgit v1.1 at 2024-05-05 04:59:58 +0000