summaryrefslogtreecommitdiffstats
path: root/include/drm
Commit message (Collapse)AuthorAgeFilesLines
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-101-1/+2
| | | | | | | | | 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
* Add a new API on DRM Framework for streamingKei Takahashi2012-05-231-0/+10
| | | | | | | | | | | | 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
* Added permission check for all sensitive drm API callsJames Dong2012-02-281-0/+1
| | | | | | o all drm calls using a DecryptHandle now check the permission before proceeding Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
* Separate sniffing from session initializationJames Dong2012-01-121-2/+4
| | | | | | | | | | | | 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
* Add one more DRM error code. For bug 4422428.Gloria Wang2011-05-131-0/+1
| | | | Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6
* Add DRM errors in the DRM frameworks to MediaErrors also.Gloria Wang2011-04-291-8/+11
| | | | | | For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
* am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change ↵Gloria Wang2011-03-251-1/+1
|\ | | | | | | | | | | | | 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/+1
| | | | | | | | | | | | Change the mDrmManagerClientImpl to sp to avoid double delete the pointer. Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
* | am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in ↵Gloria Wang2011-03-221-0/+6
|\ \ | |/ | | | | | | | | | | 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-0/+6
| | | | | | | | Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
| * do not merge: Cherry pick change I6529695c from master to partially fix bug ↵Gloria Wang2011-03-211-0/+16
| | | | | | | | | | | | 4126624. Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
* | Fix for 4084554.Gloria Wang2011-03-211-0/+16
| | | | | | | | | | | | DRM framework support for enabling/disabling copy control settings from a DRM plugin Change-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564
* | Fix for bug 4126103.Gloria Wang2011-03-171-3/+3
| | | | | | | | | | | | | | | | | | 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 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error ↵Gloria Wang2011-03-141-0/+7
|\ \ | |/ | | | | | | | | | | 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-141-0/+7
| | | | | | | | | | | | Add more info and error events into the DRM framework Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
* | resolved conflicts for merge of c761a80d to masterGloria Wang2011-03-141-1/+0
|\ \ | |/ | | | | Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
| * - Some change on the DrmManager in order to support feature request 4082089.Gloria Wang2011-03-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | 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-102-11/+20
|/ | | | | | | This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead. Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
* am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."Gloria Wang2011-01-111-0/+3
|\ | | | | | | | | * commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d': DRM Framework bug fixes.
| * DRM Framework bug fixes.Takeshi Aimi2010-11-301-0/+3
| | | | | | | | | | | | | | | | | | | | - 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
* | am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-222-0/+123
|\ \ | |/ | | | | | | * commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
| * Update of DRM Framework.Takeshi Aimi2010-11-192-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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-191-3/+3
| | | | | | | | Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
* | resolved conflicts for merge of a8d7b747 to masterGloria Wang2010-11-033-23/+16
|\ \ | |/ | | | | Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
| * Update of DRM frameworkTakeshi Aimi2010-11-023-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | Add support for WV pluginGloria Wang2010-10-291-0/+4
|/ | | | Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
* Update of DRM framework.Takeshi Aimi2010-10-044-24/+55
| | | | | | | | | | | | | - Change "void" type of return value to "int" for returning status. - Add some of overloaded Java APIs which accept database Uri as input. - Add asynchronous APIs - Add OnEventListener and OnErrorListener for asynchronous APIs - Disable debug log - Change decrypt() API to accept an optional buffer needed by some of DRM schemes Changes are incorporated by Sony Corporation. Change-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c
* Initial contribution from Sony Corporation.aimitakeshi2010-09-0110-0/+1714
Add DRM Framework to support DRM content playback together with StageFright. - DRM Framework code is added - include/drm - drm - api/current.xml is updated to include DRM Framework Java APIs - cmds/servicemanager/service_manager.c is modified to add drmManager and drmIOService. Change-Id: I6d7bc9c7067362b500e530988a9ce241761866fb
generated by cgit v1.1 at 2024-11-01 01:22:50 +0000