History log of /frameworks/av/drm/common/IDrmManagerService.cpp
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
f355f18aa2cc1706761e373fe19298a9ccc9c75a 23-Jul-2013 Jeff Tinker <jtinker@google.com> Remove obsolete drm manager code

bug: 9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
0bf43848adb00922122b0a0eed2fa0318bde8317 05-Jun-2012 Hung Nguyen <hung.nguyen@sonymobile.com> Fixed memory leakage in the DRM framework

Change-Id: Ib1276bec6cafb4e94f8f13b52e50e4987765eec4
0abeaca9d1b53ee40ce9c9d2ef543dd83b5a4cc2 14-Sep-2012 Gene Morgan <gmorgan@google.com> Allow DRM client to pass the FD of an open file to the DRM server.

Part of CL https://googleplex-android-review.googlesource.com/#/c/222797/
This modifies the marshall/unmarshall of IDrmManagerService::
acquireDrmInfo() to watch for DrmInfoRequest tag "FileDescriptorKey".
If tag is present convert string to binary FD, then back to string
after passage through the interface's Binder.

Relevant bug reports:
bug: 6426185

Change-Id: I63748b7c986ca0a89613ed3f1c81f24cffb7a9b2
bf5b3b29e31b293313788d7464cfb258ac0da803 31-Jul-2012 James Dong <jdong@google.com> Let getOriginalMimeType() take a fd passed from drm java applications

This patch enables the drm framework to avoid opening files directly.
As a result, the drm framework no longer needs the sdcard read permision.

o related-to-bug: 6426185

Change-Id: Ib176c35ef4b1a1a405e8e954f19a7985266f2510
cba7b32d8f2c47632313f54118ed3733b4b02cc8 18-Jan-2012 Kei Takahashi <KeiA.Takahashi@jp.sony.com> Add a new API on DRM Framework for streaming

In case of DRM streaming, decrypt session can start just after
receiving the header, and it doesn't need to wait for the entire
content. However, current API of DRM framework only accepts file
handle or URI. With this new API, DRM session can start
without waiting for the entire content.

Changes are made by SEMC and Sony.

Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
9d2f386dd2885eaffa11fd494ae258bb09fe6397 10-Jan-2012 James Dong <jdong@google.com> Separate sniffing from session initialization

This avoid lengthy/duplicate sniffing for drm plugins when a decrypt session is opened

o The change is backward compatibile in that no update is required
for existing drm plug-ins if they do not plan to provide separate

related-to-bug: 5725548

Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
3856b090cd04ba5dd4a59a12430ed724d5995909 20-Oct-2011 Steve Block <steveblock@google.com> Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
197f047db2909c3d8cc84b95f69d18410a935fb8 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
8f00151cbe693d52f3e233757c57fab3b6396d21 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
ab00df4d8585b181e9058eb1b9c7996aa3bbaeab 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
c10ce33302f91896fc2a87c13b00518a4bc26e3a 15-Jun-2011 Gloria Wang <gwang@google.com> -Fix some typo
-Remove one unnecessary memory allocation

Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
0b500c2e81288190a6ce8b20c842a83a19e038b5 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
6b2a35bbec228ce012065260ba153ee894f17a4e 22-Mar-2011 Gloria Wang <gwang@google.com> Add one more field in DecryptHandle to support bug 4126624

Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
4dabc20fa21f78a0bc2f91f772ad449ac8b17028 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
1da9aa606096e14985924e8433a087d04f68ea22 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
b5ce361d19e69fe156f7188c9ee0f4734b259874 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
6b610a3d31a225adfc5867223df25dba16637bd9 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
2ed8a921ef55aa2f3dd4b7ac33b7ded6ec33d92d 20-Jan-2011 Gloria Wang <gwang@google.com> More fix for 64 bit offset.

Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
6dc4726e7fa14e4006f6790c6f1ba02cfe888870 23-Nov-2010 Gloria Wang <gwang@google.com> am 24a90c26: am d9334934: Merge "Update of DRM Framework."

* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18':
Update of DRM Framework.
a2cd44cb5067b4fe98794860690394254d3ac73c 20-Nov-2010 Gloria Wang <gwang@google.com> 64-bit file size/offset support for DRM framework

Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
3473846f64f5b28e1cbeb70ef5867073fc93159e 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
b251f75d5ca3fa19cfe8a284717e00dec31f18ea 03-Nov-2010 Gloria Wang <gwang@google.com> resolved conflicts for merge of a8d7b747 to master

Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
5a6d1487905df5ea28168bd907aae93c0688dadf 02-Nov-2010 Gloria Wang <gwang@google.com> Disable some logs

Change-Id: I05fcf6869916504367814fd2abd2b1af88619f5b
e943f84129326ab885cc7a69dcfa17f766b72b89 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
2272ee27d9022d173b6eab45c409b3c3f57f30ec 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
27ed8ad2db653f6ac07dcf8bcc05e2409c8bb024 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