4585e8f0ff47580fdb81ed8652bde32db1770050 |
31-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Revert "Enhancement for OnInfo callback on DRM Framework" This reverts commit 5ff7836da0220b3097f36c8a5e82111816ebca62. Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video bug: 10542864 Change-Id: I7f81a41c3acdbeb571a514b3f65e7ba37d403cca
rmInfoEvent.h
|
5ff7836da0220b3097f36c8a5e82111816ebca62 |
11-Jul-2012 |
Takeshi Aimi <takeshi.aimi@sonymobile.com> |
Enhancement for OnInfo callback on DRM Framework In DRM framework, plugins can transmit DrmInfoEvent to Java layer. Although DrmInfoEvent has several entries, current implementation can only convey integer and String. This change enables plugins uto propagate a hashmap to Java layer. The hashmap can have one or more Strings and one byte array as value. Changes are made by Sony Corporation. bug: 10459159 Change-Id: Ic19265d4ad3db4eda66a3c27e1e08873a8f2a4d7 (cherry picked from commit 4f782bf0cb69929ebf03de239e2c9bf8e82adf5e)
rmInfoEvent.h
|
bf5b3b29e31b293313788d7464cfb258ac0da803 |
31-Jul-2012 |
James Dong <jdong@google.com> |
Let getOriginalMimeType() take a fd passed from drm java applications 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
rmManagerClient.h
|
cba7b32d8f2c47632313f54118ed3733b4b02cc8 |
18-Jan-2012 |
Kei Takahashi <KeiA.Takahashi@jp.sony.com> |
Add a new API on DRM Framework for streaming 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
rmManagerClient.h
|
328745b130c1c59e53d68a9a3c71675d3932d34b |
28-Feb-2012 |
James Dong <jdong@google.com> |
Added permission check for all sensitive drm API calls o all drm calls using a DecryptHandle now check the permission before proceeding Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
rm_framework_common.h
|
9d2f386dd2885eaffa11fd494ae258bb09fe6397 |
10-Jan-2012 |
James Dong <jdong@google.com> |
Separate sniffing from session initialization 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
rmManagerClient.h
|
5c26937264d9748a3db2a554c188e517523aa31a |
13-May-2011 |
Gloria Wang <gwang@google.com> |
Add one more DRM error code. For bug 4422428. Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6
rm_framework_common.h
|
7340743ce30766af6334bbd9acf813eb66dd5a60 |
29-Apr-2011 |
Gloria Wang <gwang@google.com> |
Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
rm_framework_common.h
|
277360f06bdfefe821d4ddde8876f8e2507887c3 |
25-Mar-2011 |
Gloria Wang <gwang@google.com> |
am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 * commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3': Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
|
25cd5788a70f45c807ad22aa0ecdc7e1d4d5fd67 |
24-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer. Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
rmManagerClient.h
|
0b500c2e81288190a6ce8b20c842a83a19e038b5 |
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 * commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385': Add one more field in DecryptHandle to support bug 4126624
|
6b2a35bbec228ce012065260ba153ee894f17a4e |
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
Add one more field in DecryptHandle to support bug 4126624 Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
rm_framework_common.h
|
4dabc20fa21f78a0bc2f91f772ad449ac8b17028 |
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624. Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
rm_framework_common.h
|
1da9aa606096e14985924e8433a087d04f68ea22 |
20-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for 4084554. DRM framework support for enabling/disabling copy control settings from a DRM plugin Change-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564
rm_framework_common.h
|
79cbc13ede26d08ab6633a042843a9d154c3c166 |
17-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 4126103. mMessage in DrmInfoEvent is a reference to the message string, so the temporary message created in the plugin was going out of scope and being destructed while the message was being sent. Changed DrmInfoEvent's mMessage to be const String8 instead of const String8& Change-Id: I174197ad24f3df997d3bc1f897658cfc53862636
rmInfoEvent.h
|
1b99cc90afffbda6013ebbb45d64f17b1d90b9f5 |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1 * commit '67718e076422f8f28f4e30a39df9e462ef32d19b': For issue 4082089 Add more info and error events into the DRM framework
|
505bd99ec8bed47c438ac3bb4641ce5f7ba972e7 |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
For issue 4082089 Add more info and error events into the DRM framework Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
rmInfoEvent.h
|
1825ce2475d4cbed336ddb779ab5acb09d9a155c |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of c761a80d to master Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
|
0e0a5f9e0b7a7ca618e8a1f7ccecc57a17e0d1e2 |
11-Mar-2011 |
Gloria Wang <gwang@google.com> |
- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock. Change-Id: I59c794f95ba1693425723224114fa975cf9b235f
rmManagerClient.h
|
b5ce361d19e69fe156f7188c9ee0f4734b259874 |
25-Feb-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 3477330 This patch fixs a crash bug caused by using a NULL DecryptHandle pointer. Fix by using sp<DecryptHandle> instead. Change-Id: Icbd59858385e8256125a615a3c82656b25319d44
rmManagerClient.h
rm_framework_common.h
|
ac2652c25f5d2a38709131f7731651bc5819fed5 |
11-Jan-2011 |
Gloria Wang <gwang@google.com> |
am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes." * commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d': DRM Framework bug fixes.
|
c618b5af98dec06d49374a61a5a94016f9fec2d3 |
30-Nov-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
DRM Framework bug fixes. - 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
rmManagerClient.h
|
6dc4726e7fa14e4006f6790c6f1ba02cfe888870 |
23-Nov-2010 |
Gloria Wang <gwang@google.com> |
am 24a90c26: am d9334934: Merge "Update of DRM Framework." * commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
|
a2cd44cb5067b4fe98794860690394254d3ac73c |
20-Nov-2010 |
Gloria Wang <gwang@google.com> |
64-bit file size/offset support for DRM framework Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
rmManagerClient.h
|
3473846f64f5b28e1cbeb70ef5867073fc93159e |
16-Nov-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
Update of DRM Framework. -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
rmManagerClient.h
rmMetadata.h
|
b251f75d5ca3fa19cfe8a284717e00dec31f18ea |
03-Nov-2010 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of a8d7b747 to master Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
|
e943f84129326ab885cc7a69dcfa17f766b72b89 |
08-Oct-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
Update of DRM framework - 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
rmInfoEvent.h
rmInfoStatus.h
rmManagerClient.h
|
6dc55e7067d2baaf92970bd03412df98bf7f88c8 |
30-Oct-2010 |
Gloria Wang <gwang@google.com> |
Add support for WV plugin Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
rm_framework_common.h
|
2272ee27d9022d173b6eab45c409b3c3f57f30ec |
20-Sep-2010 |
Takeshi Aimi <aimitakeshi@gmail.com> |
Update of DRM framework. - 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
rmInfoEvent.h
rmManagerClient.h
rmRights.h
rm_framework_common.h
|
27ed8ad2db653f6ac07dcf8bcc05e2409c8bb024 |
29-Jul-2010 |
aimitakeshi <aimitakeshi@gmail.com> |
Initial contribution from Sony Corporation. 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
rmConstraints.h
rmConvertedStatus.h
rmInfo.h
rmInfoEvent.h
rmInfoRequest.h
rmInfoStatus.h
rmManagerClient.h
rmRights.h
rmSupportInfo.h
rm_framework_common.h
|