summaryrefslogtreecommitdiffstats
path: root/drm/drmserver/DrmManagerService.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Add SELinux MAC to DrmManagerService.Riley Spahn2014-07-251-12/+70
| | | | | | | Add SELinux checks on all interfaces exposed by the DrmManagerService. Change-Id: Ib170d3229d88781b76e5fc1c557c8fed233df5d1
* Fix Externally reported security issueJeff Tinker2014-07-111-1/+12
| | | | | bug: 12724697 Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13
* Remove obsolete drm manager codeJeff Tinker2013-07-231-5/+0
| | | | | bug: 9545965 Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
* Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-101-2/+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
* 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
* 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
* Separate sniffing from session initializationJames Dong2012-01-121-4/+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
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-30/+30
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Fix for bug 4371230.Gloria Wang2011-07-251-2/+2
| | | | | | | | | - 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
* Add memory leak tracking/debugging code to drm serverJames Dong2011-03-141-0/+29
| | | | | | bug - 4099038 Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
* am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-221-2/+47
|\ | | | | | | | | * commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
| * Update of DRM Framework.Takeshi Aimi2010-11-191-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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
* Update of DRM frameworkTakeshi Aimi2010-11-021-31/+15
| | | | | | | | | | | | | | | | - 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
* Update of DRM framework.Takeshi Aimi2010-10-041-29/+40
| | | | | | | | | | | | | - 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/+218
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