| 601a90c38a61fccb614ee1da9f3a388a7a1c2302 |
|
01-Aug-2011 |
Gloria Wang <gwang@google.com> |
Fix ordering assumption of argument evaluation.
No specific order is specified in the C++ standard, but the order of
the calls to Parcel read commands matters. Move any calls with multiple
reads to local variables.
Fix for bug 5103507.
Change-Id: Ic23ad50ec5f443146f00324b66d5e2bd5b9ffd0d
/frameworks/base/drm/common/IDrmManagerService.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
/frameworks/base/drm/common/IDrmManagerService.cpp
|
| 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
/frameworks/base/drm/common/IDrmManagerService.cpp
|
| 2980a213752d6e30edd4c689489cb4a2c3006252 |
|
15-Jun-2011 |
Gloria Wang <gwang@google.com> |
-Fix some typo
-Remove one unnecessary memory allocation
Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
/frameworks/base/drm/common/IDrmManagerService.cpp
|
| 66044c17924f56ee838e1b4262e1f64f7723aac2 |
|
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
* commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385':
Add one more field in DecryptHandle to support bug 4126624
|
| c430394ed7dcb458b0850bb1ce28abeb49252d77 |
|
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
Add one more field in DecryptHandle to support bug 4126624
Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
/frameworks/base/drm/common/IDrmManagerService.cpp
|
| ee4084bf063249b3506cdc0a454dd19fa8f7549f |
|
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
/frameworks/base/drm/common/IDrmManagerService.cpp
|
| 3bbeaacfc0348a951c4bac56f2311fa9c3fe4f38 |
|
20-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for 4084554.
DRM framework support for enabling/disabling copy control settings from a DRM plugin
Change-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564
/frameworks/base/drm/common/IDrmManagerService.cpp
|
| ae7752798a98fc81ff5e6ae69dde2137692106be |
|
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
/frameworks/base/drm/common/IDrmManagerService.cpp
|
| 2ef2d49aa3c19e99e2a753dac2dfb51fc87b5328 |
|
04-Mar-2011 |
Gloria Wang <gwang@google.com> |
- Change level of some LOGs from LOGE to LOGV because those logs
are not error logs from non-DRMed content's point of view.
- Add more mutex lock to avoid crash by multi-thread calls.
- Fix for bug 4050039
Change-Id: I52fed22069f0cda6c4ac6a5363469168c797a33b
/frameworks/base/drm/common/IDrmManagerService.cpp
|
| d0423d2b129502fe9cb2d3efd7d9db2db847af89 |
|
20-Jan-2011 |
Gloria Wang <gwang@google.com> |
More fix for 64 bit offset.
Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
/frameworks/base/drm/common/IDrmManagerService.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
/frameworks/base/drm/common/IDrmManagerService.cpp
|
| 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/common/IDrmManagerService.cpp
|
| e3afc288ddddeda4e771be71f15b166f8aaa01e1 |
|
03-Nov-2010 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of a8d7b747 to master
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
|
| 1b42e92decd815c72ecc83d11f5c0c37f035c696 |
|
02-Nov-2010 |
Gloria Wang <gwang@google.com> |
Disable some logs
Change-Id: I05fcf6869916504367814fd2abd2b1af88619f5b
/frameworks/base/drm/common/IDrmManagerService.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
/frameworks/base/drm/common/IDrmManagerService.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
/frameworks/base/drm/common/IDrmManagerService.cpp
|
| 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/common/IDrmManagerService.cpp
|