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
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
|
8f00151cbe693d52f3e233757c57fab3b6396d21 |
22-Jul-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 4371230. - 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
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
|
c10ce33302f91896fc2a87c13b00518a4bc26e3a |
15-Jun-2011 |
Gloria Wang <gwang@google.com> |
-Fix some typo -Remove one unnecessary memory allocation Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
lugInManager.h
|
1006c80903c4e6b0554a3bc2e3585639c395927d |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "Bug fixes of DRM framework."
|
99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65 |
15-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1 * commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d': Bug 4016329 do full string comparisons
|
8d2577b9ac2f95f218db59a78447efd3c6a742dd |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
Bug fixes of DRM framework. - Add death listener to clean-up drmserver appropriately when drmserver died. - Remove "static" declaration of mUniqueIdVector because it was not needed to be static variable. - Remove "class DrmContentIds;" because the class does not exist. - contentPath in saveRights() could be empty because it is not required by some DRM schemes. - Fix naming convention to use sXXX for static variables. - Fix typo Change-Id: I7d440488fc074c200f1009d1bafafeffebd690b2
rmManager.h
rmManagerClientImpl.h
DrmManagerService.h
|
8635b7b095fbf7ffc63d3ce791891a9116ace1f6 |
15-Mar-2011 |
James Dong <jdong@google.com> |
Add memory leak tracking/debugging code to drm server bug - 4099038 Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
rmManagerService.h
|
41b3d3be18b54e72a44813cbdd180aae7e77b444 |
14-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4016329 do full string comparisons Use full string comparisons instead of partial for file extension and MIME type. Do case-insensitive comparison of MIME type and file extensions. Fix error in comment for String8::getPathExtension. Remove dead code -- StringTokenizer is unused. Change-Id: I322be6235abbdaab5f7eafa48926dbb2cf46dc29
lugInManager.h
tringTokenizer.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
rmManager.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
rmManagerClientImpl.h
|
44482001e106cfb7389110f869ddae381f8a2da7 |
21-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3361124 Remove drmioserver, continued Change-Id: I525b7a3ac1a79d3aaa1d3c7853df1c903b38b7c0
rmIOService.h
DrmIOService.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
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.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
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
|
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
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.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
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmManagerService.h
eadWriteUtils.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
rmIOService.h
rmManager.h
rmManagerClientImpl.h
rmManagerService.h
DrmIOService.h
DrmManagerService.h
DrmServiceListener.h
lugInManager.h
eadWriteUtils.h
tringTokenizer.h
|