summaryrefslogtreecommitdiffstats
path: root/drm/jni
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Let getOriginalMimeType() take a fd passed from drm java ↵James Dong2012-08-221-5/+11
|\ | | | | | | applications" into jb-mr1-dev
| * Let getOriginalMimeType() take a fd passed from drm java applicationsJames Dong2012-08-221-5/+11
| | | | | | | | | | | | | | | | | | | | At present, we did not actually pass the fd. This patch allows us to make the changes necessary in the future without worrying too much about broken build. related-to-bug: 6426185 Change-Id: I125decff9be621a72f2631fd439994a94a526606
* | Release JNI local references as soon as possible.Henrik B Andersson2012-08-172-49/+59
|/ | | | | | | | The JNI layer has a fix amount (512) of jni references. They should be released as soon as possible. In for and while loops they can quickly reach the limit. Change-Id: Id984345e1cc4f7aa6eb31a263b796c3da9edf773
* frameworks base Android.mk file changesJames Dong2012-03-281-3/+3
| | | | Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
* There was copy and paste code in JNI to create a DrmConvertedStatus object.James Dong2012-03-051-40/+25
| | | | | | o This patch removed duplicated code. Change-Id: Ic3d3461fb8da6fab1b4d19d28b8d9d4abc8a53b1
* Fix some JNI issues in the drm frameworkJames Dong2012-03-021-30/+9
| | | | | | | o allocated array using new must be deleted using delete[] o removed duplicated code Change-Id: Ifa8e2e1cd46568c5266717eb1ad340b61a843adc
* DRM framwork bug fix: add an API to release resourcesKei Takahashi2012-02-291-12/+22
| | | | | | | | | | | | | | | | | | | | When DrmManagerClient object is created and released many times, the process suddenly crashes. The case can happen when we make many thumbnails of DRM-encrypted contents. The problem is caused by shortage of file descriptors. DrmManagerClient releases references of file descriptors only when GC runs. So file descriptors are kept long time even after the reference of DrmManagerClient are released. By introducing DrmManagerClient#release() API, the problem is solved. An application call this API when we no longer need to use DrmManagerClient object. Changes are made by SEMC and Sony. Change-Id: Ie0bbc29cc33872449824285a8d67b1c3cdd8082b
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-191-1/+1
| | | | Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)Steve Block2012-01-191-38/+38
| | | | Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
* Fix for bug 4371230.Gloria Wang2011-07-251-4/+7
| | | | | | | | | - 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
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-7/+2
| | | | | | Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
* frameworks/base: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-1/+1
| | | | | Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481 Signed-off-by: Iliyan Malchev <malchev@google.com>
* Update of DRM Framework.Takeshi Aimi2010-11-191-0/+41
| | | | | | | | | | | | | | | | | | | | | | -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
* Update of DRM frameworkTakeshi Aimi2010-11-021-26/+21
| | | | | | | | | | | | | | | | - 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-28/+32
| | | | | | | | | | | | | - 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
* Make DRM libraries optionalJean-Baptiste Queru2010-09-101-0/+2
| | | | Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
* fix buildJean-Baptiste Queru2010-09-091-2/+7
| | | | Change-Id: Iccb40c8c5df879288f35e0940c721d306fb75c12
* Initial contribution from Sony Corporation.aimitakeshi2010-09-012-0/+798
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-10-31 21:41:19 +0000