summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Collapse)AuthorAgeFilesLines
* - 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
* | | am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in ↵Gloria Wang2011-03-221-2/+17
|\ \ \ | |/ / |/| / | |/ | | | | | | DecryptHandle to support bug 4126624" into honeycomb-mr1 * commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385': Add one more field in DecryptHandle to support bug 4126624
| * Add one more field in DecryptHandle to support bug 4126624Gloria Wang2011-03-211-2/+17
| | | | | | | | Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
| * do not merge: Cherry pick change I6529695c from master to partially fix bug ↵Gloria Wang2011-03-211-188/+88
| | | | | | | | | | | | 4126624. Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
* | Fix for 4084554.Gloria Wang2011-03-211-188/+88
| | | | | | | | | | | | DRM framework support for enabling/disabling copy control settings from a DRM plugin Change-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564
* | Fix for bug 4126103.Gloria Wang2011-03-171-2/+2
| | | | | | | | | | | | | | | | | | mMessage in DrmInfoEvent is a reference to the message string, so the temporary message created in the plugin was going out of scope and being destructed while the message was being sent. Changed DrmInfoEvent's mMessage to be const String8 instead of const String8& Change-Id: I174197ad24f3df997d3bc1f897658cfc53862636
* | Merge "Bug fixes of DRM framework."Gloria Wang2011-03-156-19/+36
|\ \
| * | Bug fixes of DRM framework.Gloria Wang2011-03-156-19/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add death listener to clean-up drmserver appropriately when drmserver died. - Remove "static" declaration of mUniqueIdVector because it was not needed to be static variable. - Remove "class DrmContentIds;" because the class does not exist. - contentPath in saveRights() could be empty because it is not required by some DRM schemes. - Fix naming convention to use sXXX for static variables. - Fix typo Change-Id: I7d440488fc074c200f1009d1bafafeffebd690b2
* | | am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" ↵Glenn Kasten2011-03-155-162/+6
|\ \ \ | | |/ | |/| | | | | | | | | | | | | into honeycomb-mr1 * commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d': Bug 4016329 do full string comparisons
| * | Bug 4016329 do full string comparisonsGlenn Kasten2011-03-145-162/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use full string comparisons instead of partial for file extension and MIME type. Do case-insensitive comparison of MIME type and file extensions. Fix error in comment for String8::getPathExtension. Remove dead code -- StringTokenizer is unused. Change-Id: I322be6235abbdaab5f7eafa48926dbb2cf46dc29
* | | Add memory leak tracking/debugging code to drm serverJames Dong2011-03-143-0/+32
| | | | | | | | | | | | | | | | | | bug - 4099038 Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
* | | frameworks/base: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-143-3/+3
| | | | | | | | | | | | | | | Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | resolved conflicts for merge of c761a80d to masterGloria Wang2011-03-143-7/+3
|\ \ \ | |/ / | | / | |/ |/| Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
| * - Some change on the DrmManager in order to support feature request 4082089.Gloria Wang2011-03-113-7/+3
| | | | | | | | | | | | | | | | | | | | | | In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock. Change-Id: I59c794f95ba1693425723224114fa975cf9b235f
* | Fix for bug 3477330Gloria Wang2011-03-104-67/+92
|/ | | | | | | This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead. Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
* - Change level of some LOGs from LOGE to LOGV because those logsGloria Wang2011-03-092-4/+31
| | | | | | | | are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039 Change-Id: I52fed22069f0cda6c4ac6a5363469168c797a33b
* To support DRM files without file extensionGloria Wang2011-03-022-2/+5
| | | | Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c
* Move all Widevine code which have dependency on vendor modules to ↵Gloria Wang2011-02-188-1204/+0
| | | | | | vendor/widevine Change-Id: If75bce539bae02117fb4f628be64e3a7363375e9
* - Update from WidevineGloria Wang2011-02-188-0/+1204
| | | | | | - Bug fixes Change-Id: I494cfe145e7aad36f3d8c68841cab847487dd85b
* Bug 3361124 Remove drmioserver, continuedGlenn Kasten2011-01-214-207/+0
| | | | Change-Id: I525b7a3ac1a79d3aaa1d3c7853df1c903b38b7c0
* am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycombGloria Wang2011-01-191-2/+2
|\ | | | | | | | | * commit '113529f062c43b111efbbd1382e23befdd1cdd30': More fix for 64 bit offset.
| * am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycombGloria Wang2011-01-191-2/+2
| |\ | | | | | | | | | | | | * commit 'a4b0cdc96e309168517f4b4da24b7647668f99a7': More fix for 64 bit offset.
| | * More fix for 64 bit offset.Gloria Wang2011-01-191-2/+2
| | | | | | | | | | | | Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
* | | rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/Gloria Wang2011-01-181-1/+1
| | | | | | | | | | | | Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
* | | am c35b3268: am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock ↵Gloria Wang2011-01-1327-0/+5370
|\ \ \ | |/ / | | | | | | | | | | | | | | | contribution" * commit 'c35b3268919e6201f269eb9011ae184c5f613bc3': Initial OMA DRM forward lock contribution
| * | am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"Gloria Wang2011-01-1327-0/+5370
| |\ \ | | | | | | | | | | | | | | | | * commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394': Initial OMA DRM forward lock contribution
| | * \ Merge "Initial OMA DRM forward lock contribution"Gloria Wang2011-01-1327-0/+5370
| | |\ \
| | | * | Initial OMA DRM forward lock contributionPravat Dalbehera2011-01-0527-0/+5370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMA DRM forward lock agent is plugged into the Open DRM framework. Forward lock agent implementation contains: - Forward lock engine to communicate with framework - Converter to encrypt the original file into a special format - Decoder to feed the decrypted data for rendering - Lightweight unique key-encryption mechanism - Documentation Change-Id: Id828ebc30b8147b58b14960a73571648bc01ae94
* | | | | Merge "Bug 3229711"Glenn Kasten2011-01-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bug 3229711Glenn Kasten2011-01-111-1/+1
| | |_|/ | |/| | | | | | | | | | Change-Id: I3a4d41597cb92a1526417a622390dbb93dc71e99
* | | | am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."Gloria Wang2011-01-113-2/+8
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d': DRM Framework bug fixes.
| * | DRM Framework bug fixes.Takeshi Aimi2010-11-303-2/+8
| |/ | | | | | | | | | | | | | | | | | | - Make sure to clean-up obsolete listeners. - Close cursor after using it. - Add virtual destructor to the base class of OnInfoListener. Changes are made by SEMC and Sony. Change-Id: Ibb6dd625ef48e3597188f0d7c90f9d4c780b6139
* | Remove empty Widevine make filesGloria Wang2010-11-241-27/+0
| | | | | | | | Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
* | am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-2216-2/+310
|\ \ | |/ | | | | | | * commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
| * Update of DRM Framework.Takeshi Aimi2010-11-1916-2/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Access permission handling Introduce an internal function which allows the desired process to access decryption flow. This new function is just for reference and each OEM manufacturer should implement/replace with their solutions. -New API, getMetadata() This API is for retrieving media metadata from container-based DRM, such as OMA forward-lock content. This API asks DRM agent to retrieve media metadata hiddein inside of DRM special container. -New API, acquireRights() This API wraps acquireDrmInfo() and processDrmInfo(). If DRM agent has valid implementation of both APIs, Application can acquire DrmRights only by calling this API. -Bug fix in event loop of OnInfoListener. Separate OnInfo event loop from mail thread loop so as to avoid the issue that message is not dispatched when mail thread is busy. Changes are made by SEMC and Sony. Change-Id: I04ee3e0988152a71e221f2256d83253749a29da0
* | 64-bit file size/offset support for DRM frameworkGloria Wang2010-11-1915-59/+59
| | | | | | | | Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
* | resolved conflicts for merge of a8d7b747 to masterGloria Wang2010-11-0315-204/+259
|\ \ | |/ | | | | Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
| * Update of DRM frameworkTakeshi Aimi2010-11-0215-220/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Overload openDecryptSession() with uri parameter in order to accept URI of DRM content, Following API is added, DecryptHandle*openDecryptSession(const char* uri);. - Unify texisting three event types of processDrmInfo() so that caller of DRM framework does not have to handle many event types. - Let DrmManagerService call load/unload plugins API so that client of DRM framework does not have to manage plug-in load/unload. - Trivial fix in DrmManagerClient.java is also incorporated. Changes are made by Sony Corporation. Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
generated by cgit v1.1 at 2024-05-20 22:10:09 +0000