summaryrefslogtreecommitdiffstats
path: root/include/drm/drm_framework_common.h
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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 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 3477330Gloria Wang2011-03-101-2/+8
|/ | | | | | | This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead. Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
* Add support for WV pluginGloria Wang2010-10-291-0/+4
| | | | Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
* Update of DRM framework.Takeshi Aimi2010-10-041-2/+2
| | | | | | | | | | | | | - 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-011-0/+300
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