summaryrefslogtreecommitdiffstats
path: root/drm
Commit message (Collapse)AuthorAgeFilesLines
* Bug 3361124 Remove drmioserver, continuedGlenn Kasten2011-01-214-207/+0
| | | | Change-Id: I525b7a3ac1a79d3aaa1d3c7853df1c903b38b7c0
* am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycombGloria Wang2011-01-191-2/+2
|\ | | | | | | | | * commit '113529f062c43b111efbbd1382e23befdd1cdd30': More fix for 64 bit offset.
| * am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycombGloria Wang2011-01-191-2/+2
| |\ | | | | | | | | | | | | * commit 'a4b0cdc96e309168517f4b4da24b7647668f99a7': More fix for 64 bit offset.
| | * More fix for 64 bit offset.Gloria Wang2011-01-191-2/+2
| | | | | | | | | | | | Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
* | | rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/Gloria Wang2011-01-181-1/+1
| | | | | | | | | | | | Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
* | | am c35b3268: am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock ↵Gloria Wang2011-01-1327-0/+5370
|\ \ \ | |/ / | | | | | | | | | | | | | | | contribution" * commit 'c35b3268919e6201f269eb9011ae184c5f613bc3': Initial OMA DRM forward lock contribution
| * | am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"Gloria Wang2011-01-1327-0/+5370
| |\ \ | | | | | | | | | | | | | | | | * commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394': Initial OMA DRM forward lock contribution
| | * \ Merge "Initial OMA DRM forward lock contribution"Gloria Wang2011-01-1327-0/+5370
| | |\ \
| | | * | Initial OMA DRM forward lock contributionPravat Dalbehera2011-01-0527-0/+5370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMA DRM forward lock agent is plugged into the Open DRM framework. Forward lock agent implementation contains: - Forward lock engine to communicate with framework - Converter to encrypt the original file into a special format - Decoder to feed the decrypted data for rendering - Lightweight unique key-encryption mechanism - Documentation Change-Id: Id828ebc30b8147b58b14960a73571648bc01ae94
* | | | | Merge "Bug 3229711"Glenn Kasten2011-01-121-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bug 3229711Glenn Kasten2011-01-111-1/+1
| | |_|/ | |/| | | | | | | | | | Change-Id: I3a4d41597cb92a1526417a622390dbb93dc71e99
* | | | am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."Gloria Wang2011-01-113-2/+8
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d': DRM Framework bug fixes.
| * | DRM Framework bug fixes.Takeshi Aimi2010-11-303-2/+8
| |/ | | | | | | | | | | | | | | | | | | - 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
* | Remove empty Widevine make filesGloria Wang2010-11-241-27/+0
| | | | | | | | Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
* | am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-2216-2/+310
|\ \ | |/ | | | | | | * commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
| * Update of DRM Framework.Takeshi Aimi2010-11-1916-2/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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-1915-59/+59
| | | | | | | | Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
* | resolved conflicts for merge of a8d7b747 to masterGloria Wang2010-11-0315-204/+259
|\ \ | |/ | | | | Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
| * Update of DRM frameworkTakeshi Aimi2010-11-0215-220/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | Disable some logsGloria Wang2010-11-022-5/+0
| | | | | | | | Change-Id: I05fcf6869916504367814fd2abd2b1af88619f5b
* | Add support for WV pluginGloria Wang2010-10-291-0/+27
| | | | | | | | Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
* | Do not create drm directory here. Fix for bug 3134576.Gloria Wang2010-10-261-16/+1
|/ | | | Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
* Update of DRM framework.Takeshi Aimi2010-10-0423-341/+550
| | | | | | | | | | | | | - 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-104-2/+7
| | | | Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
* fix buildJean-Baptiste Queru2010-09-091-2/+7
| | | | Change-Id: Iccb40c8c5df879288f35e0940c721d306fb75c12
* fix buildJean-Baptiste Queru2010-09-091-2/+7
| | | | Change-Id: Idccb3f2499bbaac61099d8232cadd633b93ad846
* fix buildJean-Baptiste Queru2010-09-091-2/+7
| | | | Change-Id: I4aba42eabb2f959b5301bfd16f65fa6141d86ddc
* Initial contribution from Sony Corporation.aimitakeshi2010-09-0138-0/+6554
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-05-18 08:02:59 +0000