summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change ↵Bill Gruber2011-03-2314-466/+589
|\ \ | |/ | | | | | | | | | | contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 * commit '640f63c2669fc9dc38b349066d4d28111655dc3f': DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
| * Merge "DRM API doc scrub This change contains information contributed by ↵Bill Gruber2011-03-2314-466/+589
| |\ | | | | | | | | | Sony Corporation. Bug: 4119363" into honeycomb-mr1
| | * DRM API doc scrubBill Gruber2011-03-2314-466/+589
| | | | | | | | | | | | | | | | | | | | | This change contains information contributed by Sony Corporation. Bug: 4119363 Change-Id: I6f565c15d512d675993dc65f7fee19bd3d0bc0fa
* | | 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
* | am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one ↵Gloria Wang2011-03-174-9/+81
|\ \ | |/ | | | | | | | | | | more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 * commit '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707': Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
| * Fix for 4089881.Gloria Wang2011-03-164-9/+81
| | | | | | | | | | | | | | | | - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls Change-Id: Ia9b1a641296629a19ae4ffa7913e6c878fd340f8
* | Merge "Bug fixes of DRM framework."Gloria Wang2011-03-157-20/+37
|\ \
| * | Bug fixes of DRM framework.Gloria Wang2011-03-157-20/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1Glenn Kasten2011-03-155-162/+6
| |\ \
| | * | 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
* | | | am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error ↵Gloria Wang2011-03-143-6/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | events into the DRM framework" into honeycomb-mr1 * commit '67718e076422f8f28f4e30a39df9e462ef32d19b': For issue 4082089 Add more info and error events into the DRM framework
| * | | For issue 4082089Gloria Wang2011-03-143-6/+18
| |/ / | | | | | | | | | | | | | | | Add more info and error events into the DRM framework Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
* | | frameworks/base: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-144-4/+4
| | | | | | | | | | | | | | | 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
* Merge "- Change level of some LOGs from LOGE to LOGV because those logs ↵Gloria 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" into honeycomb-mr1
| * - 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 uri started with http:// in some Java APIsGloria Wang2011-03-071-0/+5
|/ | | | | | Fix for bug 4016388. Change-Id: I9f6f449dca49eb03446bf6aa22b5dd467ca189c9
* Merge "Do not call processDrmInfo if acquireDrmInfo returns null"Gloria Wang2011-03-021-0/+3
|\
| * Do not call processDrmInfo if acquireDrmInfo returns nullGloria Wang2011-03-021-0/+3
| | | | | | | | Change-Id: Ib762d429daaa8cb2310951cc54f26d75aacaf673
* | 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
* Bug 3361124 Remove drmioserverGlenn Kasten2011-01-203-132/+0
| | | | Change-Id: I64cba4be8a38b60bf3873836b4cd0d1039e19706
* 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
generated by cgit v1.1 at 2024-12-26 21:47:41 +0000