| d78fc5b94d1bb3dab509ca55d09052821c51412b |
22-Aug-2012 |
James Dong <jdong@google.com> |
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
|
| 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
ndroid_drm_DrmManagerClient.cpp
|
| 057b086e0e054247840060cbd1e14295a214221b |
10-Feb-2012 |
Henrik B Andersson <henrikb.andersson@sonymobile.com> |
Release JNI local references as soon as possible.
The JNI layer has a fix amount (512) of jni references.
They should be released as soon as possible. In for
and while loops they can quickly reach the limit.
Change-Id: Id984345e1cc4f7aa6eb31a263b796c3da9edf773
ndroid.mk
ndroid_drm_DrmManagerClient.cpp
|
| ba4d0433319393d626d2169683209e4956a087e2 |
28-Mar-2012 |
James Dong <jdong@google.com> |
frameworks base Android.mk file changes
Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
ndroid.mk
|
| 9864b25bd8ac2c68f290817ac5fe73077e130b45 |
03-Mar-2012 |
James Dong <jdong@google.com> |
There was copy and paste code in JNI to create a DrmConvertedStatus object.
o This patch removed duplicated code.
Change-Id: Ic3d3461fb8da6fab1b4d19d28b8d9d4abc8a53b1
ndroid_drm_DrmManagerClient.cpp
|
| f16a2724e08d59c09c95d0fc0db09cfbe67f6141 |
03-Mar-2012 |
James Dong <jdong@google.com> |
Fix some JNI issues in the drm framework
o allocated array using new must be deleted using delete[]
o removed duplicated code
Change-Id: Ifa8e2e1cd46568c5266717eb1ad340b61a843adc
ndroid_drm_DrmManagerClient.cpp
|
| 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
ndroid_drm_DrmManagerClient.cpp
|
| c6aacce37191e1cc79cfeba13b39899f59c68c3b |
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
ndroid_drm_DrmManagerClient.cpp
|
| 06ade6ae1bd015e8b8ad0685847911213c93cc5b |
20-Oct-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
ndroid_drm_DrmManagerClient.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
ndroid_drm_DrmManagerClient.cpp
|
| bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e |
12-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
ndroid.mk
|
| 3070af08821ee86f06a9cc6b58dbb79c82946b94 |
14-Mar-2011 |
Iliyan Malchev <malchev@google.com> |
frameworks/base: remove LOCAL_PRELINK_MODULE
Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
ndroid.mk
|
| 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
ndroid_drm_DrmManagerClient.cpp
|
| 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
ndroid_drm_DrmManagerClient.cpp
|
| 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
ndroid_drm_DrmManagerClient.cpp
|
| 3802949f5cfe500b8bc41371ff99c82c9ed5d9c3 |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Make DRM libraries optional
Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
ndroid.mk
|
| beeb71dfd4ffe635daba3745515bb392f7c5ada2 |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: Iccb40c8c5df879288f35e0940c721d306fb75c12
ndroid.mk
|
| 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
ndroid.mk
ndroid_drm_DrmManagerClient.cpp
|