| 09337a07fa6b0d065f7292ea21c02097d3478717 |
05-Aug-2011 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of 845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
|
| 845fdba7b5a7b89571f2c85bd542c75650054544 |
04-Aug-2011 |
Gloria Wang <gwang@google.com> |
am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '8a6fb50d69ec40a413b117bc9145a97ec427852f':
Bug fixes in OMA DRM v1 Forward Lock Agent
|
| 93827fb09eec4d6f594c5643288cf376488a5089 |
21-Feb-2011 |
Henrik B Andersson <henrikb.andersson@sonyericsson.com> |
Bug fixes in OMA DRM v1 Forward Lock Agent
A couple of fixes in the Forward Lock Agent.
The DRM Framework isn't thread safe so the Forward Lock Agent needs
to protect the private structures.
Base64-encoded content with LF-only instead of CRLF line breaks is now
accepted.
A fix for non-standard boundary characters.
The debug prints are also turned off as default.
Change-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f
til/include/SessionMap.h
til/src/MimeTypeUtil.cpp
|
| a17d454fd0d20d14cf1fbc09f0f296cb6cbb870b |
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
nclude/DrmEngineBase.h
|
| 5c96c65f692f8c2297d213c88450dd601d2b5c1f |
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
nclude/IDrmEngine.h
|
| c35b3268919e6201f269eb9011ae184c5f613bc3 |
13-Jan-2011 |
Gloria Wang <gwang@google.com> |
am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394':
Initial OMA DRM forward lock contribution
|
| a3e96bfa89964cbc431080e1b9f4ad8981b5426b |
05-Jan-2011 |
Pravat Dalbehera <pravat.dalbehera@sonyericsson.com> |
Initial OMA DRM forward lock contribution
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
ndroid.mk
til/Android.mk
til/include/MimeTypeUtil.h
til/include/SessionMap.h
til/src/MimeTypeUtil.cpp
|
| 35f2d3997efe62ce7660ac558578ac5ca834f357 |
23-Nov-2010 |
Gloria Wang <gwang@google.com> |
am 24a90c26: am d9334934: Merge "Update of DRM Framework."
* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18':
Update of DRM Framework.
|
| 5fc3edb13edb058f14e6550d295ce3e50e5ebf8c |
20-Nov-2010 |
Gloria Wang <gwang@google.com> |
64-bit file size/offset support for DRM framework
Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
nclude/DrmEngineBase.h
nclude/IDrmEngine.h
|
| dc91865622e3cc9ff0bb33b83f1d3b38cd7a6d7a |
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
nclude/DrmEngineBase.h
nclude/IDrmEngine.h
|
| c7b3ccc564448cb4b918728421f9402bc18278c5 |
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
nclude/DrmEngineBase.h
nclude/IDrmEngine.h
|
| dc549d60f98d809f626c99de614960409a847054 |
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
nclude/DrmEngineBase.h
nclude/IDrmEngine.h
|
| d074e30ce44b9e33da43b67a4515b8986ca72b26 |
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
nclude/DrmEngineBase.h
nclude/IDrmEngine.h
|