History log of /frameworks/av/drm/drmserver/DrmManager.cpp
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
b2231171d83c196dbb97aaa2563fa142e33a91c6 13-Feb-2016 Aurimas Liutikas <aurimas@google.com> Fix more unused parameter warnings in frameworks/av/drm.

Bug: 27151704
Change-Id: Id153f12623b5d9d447f3f0605c30caf8743c367c
3ab368e0810d894dcbc0971350c095049478a055 15-Apr-2014 Mark Salyzyn <salyzyn@google.com> media: use size_t for integer iterator to Vector::size()

Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
f355f18aa2cc1706761e373fe19298a9ccc9c75a 23-Jul-2013 Jeff Tinker <jtinker@google.com> Remove obsolete drm manager code

bug: 9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
13f7fe763b9ad52fc27f21ed923c46b9555a321f 26-Oct-2012 Henrik B Andersson <henrikb.andersson@sonymobile.com> Fix for not ending up in an eternal loop in DrmManager.

In the original code a random number is used to get try
to find an empty slot in the list of free DRM id's.
When you reached the limit of 0xfff id's you ended up
in an eternal loop causing ANRs.

Updated by James Dong <jdong@google.com>.

Change-Id: I70176cc3f770223c4a8060f9739fe2bc03a703d9
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
2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c 14-Dec-2011 James Dong <jdong@google.com> am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.

* commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
785ee06d106cd7958e0c151ebc6b7174d9ba861e 14-Dec-2011 James Dong <jdong@google.com> Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck
1. Revert "Fix drm flag setting missed in false drm recognition fix."
This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.

2. Revert "Fixed the false drm recognition."
This reverts commit aadbd80b307c817698ce5110ff8e002804d1b230.

3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones"
This reverts commit a5cbf023e349f2394ba6fc58d73b4375cfec4369.

4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
This reverts commit d0d19db1ca1c289b069db33f4665bcb9386064e9.

As a result of the reverting, many ANRs from WV sniffing are back.

related-to-bug: 5739618
50a44951baf856cda679e78947e369ce923a6517 13-Dec-2011 The Android Open Source Project <initial-contribution@android.com> am f14dc291: Merge from ics-mr1

* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
Fix drm enumeration order, resolves failure to play forward lock ringtones
a9d421d3c05b98ee5481428ca3dcb3e3245140ff 10-Dec-2011 Jeff Tinker <jtinker@google.com> Fix drm enumeration order, resolves failure to play forward lock ringtones

Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9
related-to-bug: 5735466
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
5f6f4e4e89bc9b234d89276aea3eae7f677e2ff7 22-Sep-2011 Edwin Wong <edwinwong@google.com> Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded.
BUG: 5284436

Change-Id: I99267c81a488860c3c7edb747100d44f3083bfc2
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
adfb5592622305090ad39dcc2b7df477736da2c6 24-Apr-2011 James Dong <jdong@google.com> Fix memory leak from retrieval of getSupportedDrmInfo.

Change-Id: Ic2192a9791c0a3c5e5357b4367a2d8bfb15af20c
1006c80903c4e6b0554a3bc2e3585639c395927d 15-Mar-2011 Gloria Wang <gwang@google.com> Merge "Bug fixes of DRM framework."
8d2577b9ac2f95f218db59a78447efd3c6a742dd 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
0e0a5f9e0b7a7ca618e8a1f7ccecc57a17e0d1e2 11-Mar-2011 Gloria Wang <gwang@google.com> - Some change on the DrmManager in order to support feature request 4082089.
In DrmManager, we currently lock both processDrmInfo() and onInfo() which is
ok for now since processDrmInfo() is async call, and it will return without
waiting for onInfo() call. However, if we send an event in processDrmInfo(),
we will got deadlock here because we need to invoke onInf() which will wait
for processDrmInfo() to release the lock. Use different lock for onInfo().
- Remove some redundent mutex lock.

Change-Id: I59c794f95ba1693425723224114fa975cf9b235f
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
7f89d09c0f4a47119834ba15789260b933123ea5 02-Mar-2011 Gloria Wang <gwang@google.com> To support DRM files without file extension

Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c
e7be8fe9ae977a253bd9976c6d4b260961c89109 12-Jan-2011 Glenn Kasten <gkasten@google.com> Merge "Bug 3229711"
fc4f5aad4af1e2d8eea5e7d7f69d1cad4704cbb7 12-Jan-2011 Glenn Kasten <gkasten@google.com> Bug 3229711

Change-Id: I3a4d41597cb92a1526417a622390dbb93dc71e99
ac2652c25f5d2a38709131f7731651bc5819fed5 11-Jan-2011 Gloria Wang <gwang@google.com> am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."

* commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d':
DRM Framework bug fixes.
c618b5af98dec06d49374a61a5a94016f9fec2d3 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
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