| 2b7561f802bac06981dc46867d959e627085a8f7 |
01-Apr-2016 |
Jeff Tinker <jtinker@google.com> |
Update how drm file descriptors are passed through framework
bug: 26422357
Change-Id: I1df2d08d432c17c703823617ee10dc181a9b9df7
DrmManagerService.cpp
|
| 2151d8f9ae667c53749e81a93f0ec0c60f3b8e05 |
21-Sep-2015 |
Jeff Tinker <jtinker@google.com> |
am 78f7932d: am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
* commit '78f7932ddd8fed44a8fb421fcbf31f4ec1a82713':
Fix heap data leak vulnerability
|
| 78f7932ddd8fed44a8fb421fcbf31f4ec1a82713 |
21-Sep-2015 |
Jeff Tinker <jtinker@google.com> |
am 7b642b08: am 0af50080: am 8ba28c84: am d61dbb36: am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
* commit '7b642b085413ffd92caa07933b21bc00b55f9905':
Fix heap data leak vulnerability
|
| d61dbb36a673a8278eb7d63e53215b2cff804f4b |
16-Sep-2015 |
Jeff Tinker <jtinker@google.com> |
am 38281f1c: am d386c5be: Merge "Fix heap data leak vulnerability" into klp-dev
* commit '38281f1cbcd4804095828f19b7954d5219560fcd':
Fix heap data leak vulnerability
|
| 09ed70fab1f1424971ccc105dcdf5be5ce2e2643 |
14-Sep-2015 |
Jeff Tinker <jtinker@google.com> |
Fix heap data leak vulnerability
bug: 23600291
Change-Id: I7979e9e25ada01c13775be8580d433a8b4ce4ffe
DrmManagerService.cpp
|
| b408fa26c782c57272f11b46a235cca8c9ccb9be |
29-Apr-2015 |
Jeff Tinker <jtinker@google.com> |
Harden drmserver process against fuzzing attacks
bug: 19572107
Change-Id: I5ba0a434b016e8dc376f7d0eef5cf76b99ab50fd
DrmManagerService.cpp
|
| f888020c6e2735624f2b2a30e72aca24e17b8b4d |
14-Nov-2014 |
Marco Nelissen <marcone@google.com> |
Update calls to IInterface::asBinder()
to use the new static version.
Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
Conflicts:
media/libmedia/IAudioFlinger.cpp
media/libmedia/IMediaPlayer.cpp
media/libstagefright/CameraSource.cpp
DrmManagerService.cpp
|
| 06b46062d2f8bc82ca3061a23d197734ae51918b |
14-Nov-2014 |
Marco Nelissen <marcone@google.com> |
Update calls to IInterface::asBinder()
to use the new static version.
Change-Id: I89a5988a0ac694ffc04d88cf939e8455bf925d4c
DrmManagerService.cpp
|
| 12604519328867f11511b967565607971234c0ab |
17-Sep-2014 |
Dan Albert <danalbert@google.com> |
Check for NULL before calling asBinder().
The old asBinder() checked if this == NULL, which is undefined behavior.
Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c
DrmManagerService.cpp
|
| 3ab368e0810d894dcbc0971350c095049478a055 |
15-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
media: use size_t for integer iterator to Vector::size()
Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
rmSupportInfo.cpp
|
| 4585e8f0ff47580fdb81ed8652bde32db1770050 |
31-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Revert "Enhancement for OnInfo callback on DRM Framework"
This reverts commit 5ff7836da0220b3097f36c8a5e82111816ebca62.
Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video
bug: 10542864
Change-Id: I7f81a41c3acdbeb571a514b3f65e7ba37d403cca
rmInfoEvent.cpp
DrmServiceListener.cpp
|
| 5ff7836da0220b3097f36c8a5e82111816ebca62 |
11-Jul-2012 |
Takeshi Aimi <takeshi.aimi@sonymobile.com> |
Enhancement for OnInfo callback on DRM Framework
In DRM framework, plugins can transmit DrmInfoEvent to Java layer.
Although DrmInfoEvent has several entries, current implementation
can only convey integer and String. This change enables plugins
uto propagate a hashmap to Java layer. The hashmap can have
one or more Strings and one byte array as value.
Changes are made by Sony Corporation.
bug: 10459159
Change-Id: Ic19265d4ad3db4eda66a3c27e1e08873a8f2a4d7
(cherry picked from commit 4f782bf0cb69929ebf03de239e2c9bf8e82adf5e)
rmInfoEvent.cpp
DrmServiceListener.cpp
|
| f355f18aa2cc1706761e373fe19298a9ccc9c75a |
23-Jul-2013 |
Jeff Tinker <jtinker@google.com> |
Remove obsolete drm manager code
bug: 9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
DrmManagerService.cpp
|
| 0bf43848adb00922122b0a0eed2fa0318bde8317 |
05-Jun-2012 |
Hung Nguyen <hung.nguyen@sonymobile.com> |
Fixed memory leakage in the DRM framework
Change-Id: Ib1276bec6cafb4e94f8f13b52e50e4987765eec4
DrmManagerService.cpp
eadWriteUtils.cpp
|
| 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
DrmManagerService.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
rmEngineBase.cpp
DrmManagerService.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
rmEngineBase.cpp
DrmManagerService.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
|
| 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
rmEngineBase.cpp
DrmManagerService.cpp
|
| 29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47 |
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
eadWriteUtils.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
rmMetadata.cpp
DrmManagerService.cpp
|
| 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
DrmManagerService.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
DrmManagerService.cpp
|
| 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
rmSupportInfo.cpp
DrmManagerService.cpp
|
| c10ce33302f91896fc2a87c13b00518a4bc26e3a |
15-Jun-2011 |
Gloria Wang <gwang@google.com> |
-Fix some typo
-Remove one unnecessary memory allocation
Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
DrmManagerService.cpp
|
| 4fed58a760e4b3e7c3ba703d9e34406ad09dd469 |
23-Mar-2011 |
Carl Shapiro <cshapiro@google.com> |
Merge "Include strings.h for the strcasecmp prototype."
|
| 21e7c33eaf8772819bf57fe9557885e4ebc43e1b |
22-Mar-2011 |
Carl Shapiro <cshapiro@google.com> |
Include strings.h for the strcasecmp prototype.
Change-Id: I83cd464d59d16f1c5f8afa7e50d474ca2bb41713
rmSupportInfo.cpp
|
| 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
DrmManagerService.cpp
|
| 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
DrmManagerService.cpp
|
| 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
DrmManagerService.cpp
|
| 79cbc13ede26d08ab6633a042843a9d154c3c166 |
17-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 4126103.
mMessage in DrmInfoEvent is a reference to the message string, so the
temporary message created in the plugin was going out of scope and
being destructed while the message was being sent. Changed DrmInfoEvent's
mMessage to be const String8 instead of const String8&
Change-Id: I174197ad24f3df997d3bc1f897658cfc53862636
rmInfoEvent.cpp
|
| 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
|
| 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
rmSupportInfo.cpp
|
| 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
DrmManagerService.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
DrmManagerService.cpp
|
| 7f89d09c0f4a47119834ba15789260b933123ea5 |
02-Mar-2011 |
Gloria Wang <gwang@google.com> |
To support DRM files without file extension
Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c
rmSupportInfo.cpp
|
| 44482001e106cfb7389110f869ddae381f8a2da7 |
21-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3361124 Remove drmioserver, continued
Change-Id: I525b7a3ac1a79d3aaa1d3c7853df1c903b38b7c0
ndroid.mk
DrmIOService.cpp
|
| 2ed8a921ef55aa2f3dd4b7ac33b7ded6ec33d92d |
20-Jan-2011 |
Gloria Wang <gwang@google.com> |
More fix for 64 bit offset.
Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
DrmManagerService.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
rmEngineBase.cpp
DrmManagerService.cpp
eadWriteUtils.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
ndroid.mk
rmEngineBase.cpp
rmMetadata.cpp
DrmManagerService.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
DrmManagerService.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
rmEngineBase.cpp
rmInfoStatus.cpp
DrmManagerService.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
rmConstraints.cpp
rmEngineBase.cpp
rmInfoEvent.cpp
rmRights.cpp
rmSupportInfo.cpp
DrmIOService.cpp
DrmManagerService.cpp
DrmServiceListener.cpp
eadWriteUtils.cpp
|
| 0335b70c6cdbe96650d4bed817f9233cd8db1c6d |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Make DRM libraries optional
Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
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
rmConstraints.cpp
rmConvertedStatus.cpp
rmEngineBase.cpp
rmInfo.cpp
rmInfoEvent.cpp
rmInfoRequest.cpp
rmInfoStatus.cpp
rmRights.cpp
rmSupportInfo.cpp
DrmIOService.cpp
DrmManagerService.cpp
DrmServiceListener.cpp
eadWriteUtils.cpp
|