summaryrefslogtreecommitdiff
path: root/drm/common/IDrmManagerService.cpp
AgeCommit message (Collapse)Author
2012-03-28Deleted the media, camera, drm related files since they are relocatedJames Dong
Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
2012-01-12Separate sniffing from session initializationJames Dong
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
2011-10-26Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block
See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
2011-08-01Fix ordering assumption of argument evaluation.Gloria Wang
No specific order is specified in the C++ standard, but the order of the calls to Parcel read commands matters. Move any calls with multiple reads to local variables. Fix for bug 5103507. Change-Id: Ic23ad50ec5f443146f00324b66d5e2bd5b9ffd0d
2011-07-25Fix for bug 4371230.Gloria Wang
- 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
2011-06-22- Add two sanity checks.Gloria Wang
- Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle. Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
2011-06-15-Fix some typoGloria Wang
-Remove one unnecessary memory allocation Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
2011-03-22am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in ↵Gloria Wang
DecryptHandle to support bug 4126624" into honeycomb-mr1 * commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385': Add one more field in DecryptHandle to support bug 4126624
2011-03-21Add one more field in DecryptHandle to support bug 4126624Gloria Wang
Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
2011-03-21do not merge: Cherry pick change I6529695c from master to partially fix bug ↵Gloria Wang
4126624. Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
2011-03-21Fix for 4084554.Gloria Wang
DRM framework support for enabling/disabling copy control settings from a DRM plugin Change-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564
2011-03-10Fix for bug 3477330Gloria Wang
This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead. Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
2011-03-09- Change level of some LOGs from LOGE to LOGV because those logsGloria Wang
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
2011-01-19More fix for 64 bit offset.Gloria Wang
Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
2010-11-22am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang
* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
2010-11-1964-bit file size/offset support for DRM frameworkGloria Wang
Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
2010-11-19Update of DRM Framework.Takeshi Aimi
-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
2010-11-03resolved conflicts for merge of a8d7b747 to masterGloria Wang
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
2010-11-02Disable some logsGloria Wang
Change-Id: I05fcf6869916504367814fd2abd2b1af88619f5b
2010-11-02Update of DRM frameworkTakeshi Aimi
- 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
2010-10-04Update of DRM framework.Takeshi Aimi
- 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
2010-09-01 Initial contribution from Sony Corporation.aimitakeshi
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.2.3 (git 2.25.1) at 2025-10-03 12:32:13 +0000