| cd4d28fefeab0afe4555feeb962109c644547812 |
|
17-Feb-2018 |
Jeff Tinker <jtinker@google.com> |
Move mediadrm-related headers
Relocate drm and crypto headers from media
to mediadrm to have finer grained ownership
bug:73556221
Change-Id: I2f795fd22b6c36c8e4de9bf3b961acb0c1c5485e
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| 5c091dc9449b583e18656a8850a61f557dfcc945 |
|
20-Jul-2017 |
Steven Moreland <smoreland@google.com> |
Merge "frameworks/base: use proper nativehelper headers"
am: 826eafd958
Change-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2
|
| 2279b2534272282a5b5152723235da397e49195c |
|
19-Jul-2017 |
Steven Moreland <smoreland@google.com> |
frameworks/base: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using frameworks/base find headers
Bug: 63762847
Change-Id: I0f9f231acdebe460f279135462f43d3e32eff64d
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| 94dd36cae9f4f9032132b49e2cd24d573a9a465b |
|
09-May-2017 |
Jeff Tinker <jtinker@google.com> |
Fix drm hal resource leaks
bug:36408047
test: manual testing to verify leaks are fixed
Change-Id: Ic6a29572874a9fe30f36e7fdabb68d2ddeffb278
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| d12b7c0600a9568549f8571c43dcfa22cdbb03ac |
|
23-Apr-2016 |
Jeff Tinker <jtinker@google.com> |
Remove MediaDrm stack from mediaserver
Part of media security hardening
MediaDrm was temporarily allowed to
run in either mediaserver or mediadrmserver
while all nexus devices were implementing
support for the native_handle representation
of secure buffers. Now that all nexus
devices support native_handle, the MediaDrm
stack can be removed from mediaserver.
b/22990512
Change-Id: I96a5222f94cd1580ac411de5b48beb44b99cc8d7
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| dc614f86a5a61d0b4287796dfa028c637f615d34 |
|
12-Feb-2016 |
Jeff Tinker <jtinker@google.com> |
Add mediadrm service
Part of media security hardening
This is an intermediate step toward moving
mediadrm to a new service separate from mediaserver.
This first step allows mediadrmservice to run based
on the system property media.mediadrmservice.enable
so it can be selectively enabled on devices that
support using native_handles for secure buffers.
bug: 22990512
Change-Id: I9af073d8383f25657938d07be90c21c0dc6126b7
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| b57dd722f1dc0663417da37d3a82f8283ad3c982 |
|
24-Sep-2015 |
Elliott Hughes <enh@google.com> |
resolved conflicts for a884d81e to stage-aosp-master
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
|
| 76f6a86de25e1bf74717e047e55fd44b089673f3 |
|
19-Sep-2015 |
Daniel Micay <danielmicay@gmail.com> |
constify JNINativeMethod function pointer tables
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| 025af8b0de1c4697a54f6b7363e27111a00eb284 |
|
01-Jun-2015 |
Jeff Tinker <jtinker@google.com> |
Fix bug in MediaCrypto.setMediaDrmSession
MediaCryptoException was being thrown unexpectedly
bug: 21565802
Change-Id: I44768cac1e85a01c8d775b8432d11711ae978b0d
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| 6f6ef118a791c0f888db4addc6543e1f67700ead |
|
10-Apr-2015 |
Jeff Tinker <jtinker@google.com> |
Add a method to associate MediaDrm session with MediaCrypto
Previously, to associate a MediaDrm session with MediaCrypto,
the MediaDrm sessionId was passed as initData to the MediaCrypto
constructor. This is not ideal for two reasons: it's pretty
obscure and you can't change the association without tearing
down the MediaCodec/MediaCrypto and starting all over. Use
cases like key rotation require being able to update the
MediaDrm session post-construction. This CL addresses both of
these issues.
bug: 19570317
Change-Id: Ie3d3eda16651b598cdd41f2180074a43cb6c0884
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| 5a15d0d31b877ef512b3379eac033c6bb041c86a |
|
11-Nov-2014 |
Andreas Gampe <agampe@google.com> |
Frameworks/base: Wall Werror in media/jni
Turn on -Wall -Werror in media/jni. Fix warnings.
Change-Id: I9da54ad379d8172ee535b52ee2b0637a2533f4e3
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| 075e9a19ce645752f8282bc19c91b25978a7dc52 |
|
06-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in media classes
For storing pointers, long is used in media classes,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| 90defba919e8e969a9963bf401a7b144d869accf |
|
22-Mar-2013 |
Jeff Tinker <jtinker@google.com> |
Load crypto plugins from additional shared libraries
Currently crypto plugins are expected to be in libdrmdecrypt.so.
When there are multiple plugins supporting different schemes,
this approach requires source code integration across
vendors which is unmanagable. Also, for integration with
MediaDrm where the crypto keys are obtained from a drm server,
the MediaCrypto plugin needs to interoperate with the MediaDrm
plugin. This change allows {MediaCrypto, MediaDrm} pairs that
are logically related to be implemented in a common shared
library.
Multi-repository commit, goes with:
https://googleplex-android-review.googlesource.com/287838
Change-Id: I08577cda0cbcb22ebe3cb874f5fcafe411c36be3
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| 60d610bf103379277a4b29a7ead4f013f6128e4e |
|
03-May-2012 |
Andreas Huber <andih@google.com> |
Various changes to Media* APIs requested by the api council.
Change-Id: Iec2f50c99cf5f00a442737231361334e9ab46340
related-to-bug: 6432753
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| 2952c5d03c26aec8f2aa2d69f20b47a7cc8f39e1 |
|
17-Apr-2012 |
Andreas Huber <andih@google.com> |
MediaCrypto's constructor can throw RuntimeException.
Change-Id: I5718e9abab0d1465882580e826747d6a78bdefb5
related-to-bug: 6275919
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|
| 07ea426e3ae8915ca6bf67135f523f42cd920af0 |
|
11-Apr-2012 |
Andreas Huber <andih@google.com> |
Unhide new media related java APIs.
Change-Id: If0b8201eaca74f51f3499b6ecdfb73088586ee24
/frameworks/base/media/jni/android_media_MediaCrypto.cpp
|