| b710094cc9fe5eaf4b00b091ba024e2a6837a7c3 |
18-Jun-2014 |
Jeff Tinker <jtinker@google.com> |
Fix Externally reported security issue
bug: 12724697
Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13
rmManagerService.cpp
|
| 3ab368e0810d894dcbc0971350c095049478a055 |
15-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
media: use size_t for integer iterator to Vector::size()
Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
rmManager.cpp
|
| 0e56849007a0f128201e545b610f119217b41376 |
14-Mar-2014 |
Glenn Kasten <gkasten@android.com> |
More 32-bit only
Change-Id: Ic333215e39757f91b12d66b8a9ad7f43c8ba8b36
ndroid.mk
|
| f355f18aa2cc1706761e373fe19298a9ccc9c75a |
23-Jul-2013 |
Jeff Tinker <jtinker@google.com> |
Remove obsolete drm manager code
bug: 9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
rmManager.cpp
rmManagerService.cpp
|
| da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6 |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
Add liblog
Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
ndroid.mk
|
| 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
rmManager.cpp
|
| 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
rmManager.cpp
rmManagerService.cpp
|
| cc0df657cdc8316c2b816c562f269be1706f00ea |
14-Jun-2012 |
James Dong <jdong@google.com> |
am e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/" into jb-dev
* commit 'e20435de10f63af812da9d4f801b61a8817733a0':
Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
|
| 3d51d5cb53cc630709a0ba78d0e60501a675f2d5 |
13-Jun-2012 |
James Dong <jdong@google.com> |
Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26
related-to-bug: 6647465
ODULE_LICENSE_APACHE2
OTICE
|
| 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
rmManager.cpp
rmManagerService.cpp
|
| 1608735ef488ecd8c3c012a3b0d4b1d4ef3d93c7 |
13-Apr-2012 |
Andreas Huber <andih@google.com> |
Support widevine:// URLs in NuMediaExtractor / java MediaExtractor.
Allow anyone to talk to drm services.
Change-Id: I5c2f3c419d01de30c3d6e2bc85b1fe5c9c37b392
related-to-bug: 6276111
rmManagerService.cpp
|
| 559bf2836f5da25b75bfb229fec0d20d540ee426 |
28-Mar-2012 |
James Dong <jdong@google.com> |
AV Android make files changes
o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc
o remove some runtime dependencies to libandroid, libandroid_runtime, etc
Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
ndroid.mk
|
| 328745b130c1c59e53d68a9a3c71675d3932d34b |
28-Feb-2012 |
James Dong <jdong@google.com> |
Added permission check for all sensitive drm API calls
o all drm calls using a DecryptHandle now check the permission before proceeding
Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
rmManagerService.cpp
|
| d907e9451ec3c7b2244dd5605f1a26ab23466a7a |
28-Feb-2012 |
James Dong <jdong@google.com> |
Remove unnecessary header file includes for drmserver
Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
ain_drmserver.cpp
|
| 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
sniffer/extractor
related-to-bug: 5725548
Change-Id: I7fc4caf82d77472da4e2bc7b5d31060fb54fd84c
rmManager.cpp
rmManagerService.cpp
|
| 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
rmManager.cpp
|
| 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
rmManager.cpp
|
| 40ddcb7150a31052ba20878454426dc3572b7acb |
10-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Fix log message
Log did not have a tag, and was wrong level
Change-Id: I8d12895c80483e1e39f117a393b8be2f4bdd3e1d
ain_drmserver.cpp
|
| 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
rmManager.cpp
rmManagerService.cpp
|
| 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
rmManager.cpp
|
| 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
rmManager.cpp
rmManagerService.cpp
|
| 5e0067b486c3862316aa1f293cf9690c0cf54bda |
12-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
ndroid.mk
|
| adfb5592622305090ad39dcc2b7df477736da2c6 |
24-Apr-2011 |
James Dong <jdong@google.com> |
Fix memory leak from retrieval of getSupportedDrmInfo.
Change-Id: Ic2192a9791c0a3c5e5357b4367a2d8bfb15af20c
rmManager.cpp
|
| 1006c80903c4e6b0554a3bc2e3585639c395927d |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "Bug fixes of DRM framework."
|
| 99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65 |
15-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
am 7d7dcb5e: am 4528a7db: Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
* commit '7d7dcb5ea891ad4c3252ed832ebd06accc96153d':
Bug 4016329 do full string comparisons
|
| 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
rmManager.cpp
|
| 8635b7b095fbf7ffc63d3ce791891a9116ace1f6 |
15-Mar-2011 |
James Dong <jdong@google.com> |
Add memory leak tracking/debugging code to drm server
bug - 4099038
Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
ndroid.mk
rmManagerService.cpp
|
| 41b3d3be18b54e72a44813cbdd180aae7e77b444 |
14-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4016329 do full string comparisons
Use full string comparisons instead of partial for
file extension and MIME type.
Do case-insensitive comparison of MIME type and file extensions.
Fix error in comment for String8::getPathExtension.
Remove dead code -- StringTokenizer is unused.
Change-Id: I322be6235abbdaab5f7eafa48926dbb2cf46dc29
ndroid.mk
tringTokenizer.cpp
|
| 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
rmManager.cpp
|
| 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
rmManager.cpp
|
| 7f89d09c0f4a47119834ba15789260b933123ea5 |
02-Mar-2011 |
Gloria Wang <gwang@google.com> |
To support DRM files without file extension
Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c
rmManager.cpp
|
| 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
rmManager.cpp
|
| 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
rmManager.cpp
|
| 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
rmManager.cpp
rmManagerService.cpp
|
| 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
rmManager.cpp
rmManagerService.cpp
|
| 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
rmManager.cpp
|
| 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
rmManager.cpp
rmManagerService.cpp
|
| d6d4ba97bcb39bf6d0cde32ce7bef1753e420548 |
26-Oct-2010 |
Gloria Wang <gwang@google.com> |
Do not create drm directory here. Fix for bug 3134576.
Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
rmManagerService.cpp
|
| 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
rmManager.cpp
rmManagerService.cpp
tringTokenizer.cpp
|
| 0335b70c6cdbe96650d4bed817f9233cd8db1c6d |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Make DRM libraries optional
Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
ndroid.mk
|
| a4f8842d67004f168b53fc684d4622679e19a3df |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: I4aba42eabb2f959b5301bfd16f65fa6141d86ddc
ndroid.mk
|
| 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
ndroid.mk
rmManager.cpp
rmManagerService.cpp
tringTokenizer.cpp
ain_drmserver.cpp
|