| 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
rm/DrmManagerClient.java
|
| b7e7bdfe784959ac8615851c2741eb9518a5afcf |
22-Jun-2011 |
Gloria Wang <gwang@google.com> |
- Add two sanity checks.
- Remove one unnecessary line.
- Clear the extendedData vector in DecryptHandle.
Change-Id: I2610c6d68f12d48cb69323a5eb2ae4b3b3e44dff
rm/DrmRights.java
|
| 2980a213752d6e30edd4c689489cb4a2c3006252 |
15-Jun-2011 |
Gloria Wang <gwang@google.com> |
-Fix some typo
-Remove one unnecessary memory allocation
Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
rm/DrmInfoRequest.java
rm/DrmInfoStatus.java
|
| f46821b9d932ba0f1d0dfd88e98f319e0d3b789b |
24-Mar-2011 |
Bill Gruber <billg@google.com> |
am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
* commit '640f63c2669fc9dc38b349066d4d28111655dc3f':
DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
|
| 0e092f806b0a4b81785a52da8ba22d2d47087de5 |
18-Mar-2011 |
Bill Gruber <billg@google.com> |
DRM API doc scrub
This change contains information contributed by Sony Corporation.
Bug: 4119363
Change-Id: I6f565c15d512d675993dc65f7fee19bd3d0bc0fa
rm/DrmConvertedStatus.java
rm/DrmErrorEvent.java
rm/DrmEvent.java
rm/DrmInfo.java
rm/DrmInfoEvent.java
rm/DrmInfoRequest.java
rm/DrmInfoStatus.java
rm/DrmManagerClient.java
rm/DrmRights.java
rm/DrmStore.java
rm/DrmSupportInfo.java
rm/DrmUtils.java
rm/ProcessedData.java
rm/package.html
|
| 454b2d1c34238ba33d8f6861971a74c80c3e302a |
17-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1
* commit '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707':
Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
|
| f8bf3c46f524b1252bf466a351daaef61afdcecb |
16-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for 4089881.
- Add one more parameter in the interface of DrmEvent and its subclasses
DrmInfoEvent and DrmErrorEvent
- Send back DrmInfo in the response of async processDrmInfo calls
Change-Id: Ia9b1a641296629a19ae4ffa7913e6c878fd340f8
rm/DrmErrorEvent.java
rm/DrmEvent.java
rm/DrmInfoEvent.java
rm/DrmManagerClient.java
|
| 0e5e2e2b2bb3d6c3a0216181df29e6bfdc71256f |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "Bug fixes of DRM framework."
|
| 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
rm/DrmInfoRequest.java
|
| 27b277779c89251f2aafcc7a56db95d264900c9d |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
For issue 4082089
Add more info and error events into the DRM framework
Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
rm/DrmErrorEvent.java
rm/DrmInfoEvent.java
rm/DrmManagerClient.java
|
| b8b6a9a8d405d2a3f1d593ebaf7f07574dd586b9 |
07-Mar-2011 |
Gloria Wang <gwang@google.com> |
To support uri started with http:// in some Java APIs
Fix for bug 4016388.
Change-Id: I9f6f449dca49eb03446bf6aa22b5dd467ca189c9
rm/DrmManagerClient.java
|
| 4ef690a38b1dfdff3ae34e260435edcec37e520f |
03-Mar-2011 |
Gloria Wang <gwang@google.com> |
Do not call processDrmInfo if acquireDrmInfo returns null
Change-Id: Ib762d429daaa8cb2310951cc54f26d75aacaf673
rm/DrmManagerClient.java
|
| f05913aaa0cc96eab32be3431de1a80d405527a1 |
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
rm/DrmManagerClient.java
|
| 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
rm/DrmErrorEvent.java
rm/DrmEvent.java
rm/DrmManagerClient.java
|
| 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
rm/DrmErrorEvent.java
rm/DrmEvent.java
rm/DrmInfoStatus.java
rm/DrmManagerClient.java
rm/DrmUtils.java
|
| 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
rm/DrmErrorEvent.java
rm/DrmEvent.java
rm/DrmInfoEvent.java
rm/DrmManagerClient.java
|
| b01e10c5bc0a29d1b0da96783b6d1582baeb2af2 |
16-Sep-2010 |
Joe Onorato <joeo@google.com> |
There is no @note javadoc tag.
Change-Id: I4bb4e0be518b01f2a81d870ff4ec9da81555afbd
rm/DrmManagerClient.java
|
| 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
rm/DrmConvertedStatus.java
rm/DrmEvent.java
rm/DrmInfo.java
rm/DrmInfoEvent.java
rm/DrmInfoRequest.java
rm/DrmInfoStatus.java
rm/DrmManagerClient.java
rm/DrmRights.java
rm/DrmStore.java
rm/DrmSupportInfo.java
rm/DrmUtils.java
rm/ProcessedData.java
|