| 33d603877acf76d5d59484532025af20f4b068a5 |
|
17-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in DRM classes
For storing pointers, long is used in DRM classes,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: I101b0ea19ed93651c6ad1a9fa55e14e8be117469
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|
| f67c8a9685e0f20d5ffb9de95f6d1ce47f052141 |
|
13-Dec-2012 |
Jeff Sharkey <jsharkey@android.com> |
Move DRM to CloseGuard, add DrmOutputStream.
Switch DrmManagerClient to using CloseGuard to better track leaked
resources. Add DrmOutputStream which applies DRM transformation as
data is written, similar to FilterOutputStream. Also writes DRM
headers before closing.
Change-Id: Ic106a3e6f6ff666e4dda484fbd234a0849eec8c0
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|
| 58ed5d748c0b9b64845975ef5844ad313de7c3f6 |
|
07-Nov-2012 |
Kenny Root <kroot@google.com> |
am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
Correct executable bit for source files
|
| 3a084af2e90849aaa8beb3a610189e3399c63ea0 |
|
07-Nov-2012 |
Kenny Root <kroot@google.com> |
Correct executable bit for source files
Many media files and source code files were marked as executable in Git.
Remove those.
Also a shell script and python script were not marked as executable.
Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|
| 0889fdae87abd9ec78a6c1d00c2771acfa4e4d34 |
|
09-Aug-2012 |
James Dong <jdong@google.com> |
Let getOriginalMimeType() take a fd passed from drm java applications
At present, we did not actually pass the fd. This patch allows us to
make the changes necessary in the future without worrying too much
about broken build.
related-to-bug: 6426185
Change-Id: I125decff9be621a72f2631fd439994a94a526606
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|
| 011385508726fef027641fcbb3e4e446efc9af2c |
|
07-May-2012 |
James Dong <jdong@google.com> |
Fix an issue where the message queue fails to queue in the looper threads because they are not created.
o related-to-bug: 6293875
Change-Id: I03dbb2782bd90f88d1f8df086b8a529730afe5dc
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|
| 7edb9a94908f41b9dc3aa13d2089efa304f12c22 |
|
02-Mar-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
* commit 'f73222a39e0fa294d9105fd7464943aed6e77cd7':
DRM framwork bug fix: add an API to release resources
|
| 6225df010365d00b1d0f3b1ca13f18cea537c8e3 |
|
31-Jan-2012 |
Kei Takahashi <KeiA.Takahashi@jp.sony.com> |
DRM framwork bug fix: add an API to release resources
When DrmManagerClient object is created and released many times,
the process suddenly crashes.
The case can happen when we make many thumbnails of
DRM-encrypted contents.
The problem is caused by shortage of file descriptors.
DrmManagerClient releases references of file descriptors
only when GC runs. So file descriptors are kept long time
even after the reference of DrmManagerClient are released.
By introducing DrmManagerClient#release() API,
the problem is solved. An application call this API
when we no longer need to use DrmManagerClient object.
Changes are made by SEMC and Sony.
Change-Id: Ie0bbc29cc33872449824285a8d67b1c3cdd8082b
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|
| 365ce1db339db53cd5afb118ff867fe940644e45 |
|
23-Feb-2012 |
James Dong <jdong@google.com> |
Improved comment about DrmStore.ConstraintsColumns
Change-Id: I89c588759dd409ac0252d686af12bfe4e105f3d5
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|
| 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
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|
| 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
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|
| 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
/frameworks/base/drm/java/android/drm/DrmManagerClient.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
/frameworks/base/drm/java/android/drm/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
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|
| 4ef690a38b1dfdff3ae34e260435edcec37e520f |
|
03-Mar-2011 |
Gloria Wang <gwang@google.com> |
Do not call processDrmInfo if acquireDrmInfo returns null
Change-Id: Ib762d429daaa8cb2310951cc54f26d75aacaf673
/frameworks/base/drm/java/android/drm/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
/frameworks/base/drm/java/android/drm/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
/frameworks/base/drm/java/android/drm/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
/frameworks/base/drm/java/android/drm/DrmManagerClient.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
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|
| b01e10c5bc0a29d1b0da96783b6d1582baeb2af2 |
|
16-Sep-2010 |
Joe Onorato <joeo@google.com> |
There is no @note javadoc tag.
Change-Id: I4bb4e0be518b01f2a81d870ff4ec9da81555afbd
/frameworks/base/drm/java/android/drm/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
/frameworks/base/drm/java/android/drm/DrmManagerClient.java
|