summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Collapse)AuthorAgeFilesLines
* Allow DRM client to pass the FD of an open file to the DRM server.Gene Morgan2012-09-201-4/+16
| | | | | | | | | | | | | Part of CL https://googleplex-android-review.googlesource.com/#/c/222797/ This modifies the marshall/unmarshall of IDrmManagerService:: acquireDrmInfo() to watch for DrmInfoRequest tag "FileDescriptorKey". If tag is present convert string to binary FD, then back to string after passage through the interface's Binder. Relevant bug reports: bug: 6426185 Change-Id: I63748b7c986ca0a89613ed3f1c81f24cffb7a9b2
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-1018-51/+44
| | | | | | | | | This patch enables the drm framework to avoid opening files directly. As a result, the drm framework no longer needs the sdcard read permision. o related-to-bug: 6426185 Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
* Remove some unused forward lock codeJames Dong2012-08-082-61/+0
| | | | Change-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c
* am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ↵James Dong2012-06-1312-0/+1140
|\ | | | | | | | | | | | | /frameworks/av/" into jb-dev * commit 'e20435de10f63af812da9d4f801b61a8817733a0': Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
| * Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-1312-0/+1140
| | | | | | | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* | Add a new API on DRM Framework for streamingKei Takahashi2012-05-2312-0/+162
|/ | | | | | | | | | | | In case of DRM streaming, decrypt session can start just after receiving the header, and it doesn't need to wait for the entire content. However, current API of DRM framework only accepts file handle or URI. With this new API, DRM session can start without waiting for the entire content. Changes are made by SEMC and Sony. Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
* Support widevine:// URLs in NuMediaExtractor / java MediaExtractor.Andreas Huber2012-04-171-15/+1
| | | | | | | Allow anyone to talk to drm services. Change-Id: I5c2f3c419d01de30c3d6e2bc85b1fe5c9c37b392 related-to-bug: 6276111
* You don't need LOCAL_SHARED_LIBRARIES/LOCAL_STATIC_LIBRARIES to build a ↵Ying Wang2012-04-091-7/+0
| | | | | | static library. Change-Id: Ia2c4b4fb3b78cbe0d2856cec073b2c7f9c28d3cb
* Removed unnecessary include JNI from two drm Android.mk filesJames Dong2012-03-282-2/+0
| | | | Change-Id: I7b7a1acce4d6db748ff193270e73bc3582ba2380
* AV Android make files changesJames Dong2012-03-288-20/+16
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* 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
* 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
* Remove unnecessary header file includes for drmserverJames Dong2012-02-271-5/+0
| | | | Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
* 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-082-13/+13
| | | | | | | 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-265-100/+100
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Modified loadPlugIns to load from /vendor and /system; skip libraries that ↵Edwin Wong2011-09-211-9/+15
| | | | | | | | are already loaded. BUG: 5284436 Change-Id: I99267c81a488860c3c7edb747100d44f3083bfc2
* resolved conflicts for merge of 845fdba7 to masterGloria Wang2011-08-046-183/+257
|\ | | | | | | Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
| * am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 ↵Gloria Wang2011-08-046-183/+257
| |\ | | | | | | | | | | | | | | | | | | Forward Lock Agent" * commit '8a6fb50d69ec40a413b117bc9145a97ec427852f': Bug fixes in OMA DRM v1 Forward Lock Agent
| | * Bug fixes in OMA DRM v1 Forward Lock AgentHenrik B Andersson2011-08-046-183/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Fix ordering assumption of argument evaluation.Gloria Wang2011-08-011-21/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Fix for bug 4371230.Gloria Wang2011-07-2510-40/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Remove the simulator target from all makefiles.Jeff Brown2011-07-113-22/+6
| | | | | | | | | | | | | | | | | | Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
* | | - Add two sanity checks.Gloria Wang2011-06-223-1/+5
| | | | | | | | | | | | | | | | | | | | | - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle. Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | For bug 4770217. Change-Id: I14f4d4ead524c661e68a20738e7a50e4d8fd92ea
* | | | Merge "-Fix some typo -Remove one unnecessary memory allocation"Gloria Wang2011-06-162-17/+15
|\ \ \ \ | |/ / / |/| | |
| * | | -Fix some typoGloria Wang2011-06-152-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | -Remove one unnecessary memory allocation Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
* | | | To remove log spam in the Forward Lock DRM plugin.Gloria Wang2011-06-141-30/+30
|/ / / | | | | | | | | | | | | | | | Fix for bug 4619159. Change-Id: Id4984aade4cceb59a1fdf904949f62535decd2a4
* | | Duplicated fileDesc is not closed when input file is not forward-lock content.Gloria Wang2011-06-131-1/+4
| | | | | | | | | | | | | | | | | | Fix for bug 4606053. Change-Id: I1b45457d8cdc75d268631911f46ce6ec931b1770
* | | Fix memory leak from retrieval of getSupportedDrmInfo.James Dong2011-04-241-0/+2
| | | | | | | | | | | | Change-Id: Ic2192a9791c0a3c5e5357b4367a2d8bfb15af20c
* | | am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change ↵Gloria Wang2011-03-251-1/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 * commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3': Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
| * | Fix for bug 4126624.Gloria Wang2011-03-241-1/+0
| | | | | | | | | | | | | | | | | | Change the mDrmManagerClientImpl to sp to avoid double delete the pointer. Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
| * | Fix for bug 4165823.Gloria Wang2011-03-242-10/+34
| | | | | | | | | | | | | | | | | | | | | Add death listener to clean-up drmserver appropriately when drmserver died. Cherry-pick from master. Do not merge. Change-Id: I7782cc96ce173a87ebfd315950f3880fa90294d6
* | | 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
| | | | | | | | | | | | | | | | Change-Id: I83cd464d59d16f1c5f8afa7e50d474ca2bb41713
generated by cgit v1.1 at 2024-12-22 08:53:34 +0000