| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
Uses user defined permission "com.oma.drm.permission.ACCESS_OMA_DRM" to
access protected api call from Oma Drm util framework.
This changes is required for DRM Image support in Android.
CRs-Fixed: 941545
Change-Id: If9b7d079612453f51e3e9e9126dd6553e73b8a5a
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Android 6.0.0 release 5
Conflicts:
media/libstagefright/OggExtractor.cpp
media/libstagefright/Utils.cpp
Change-Id: I2ea44836c5cc3da8ffa2092522293c433bf7538c
|
| |
| |
| |
| |
| | |
bug: 23600291
Change-Id: I7979e9e25ada01c13775be8580d433a8b4ce4ffe
|
|/
|
|
|
|
|
|
| |
to let modules dependant (statically) on libdrmframeworkcommon to
be able to link to libdrmframework dynamically
CRs-Fixed: 655018
Change-Id: I745c604398d191d0d8c96a68d33f8494add303a1
|
|
|
|
|
|
|
|
| |
To support adding cts tests for new APIs in M, the
clearkey DRM plugin needs to be updated.
Change-Id: If672ecec8f570d1dd5130e8e4419d37bd931a9e2
related-to-bug: 21527003
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This file needs stdlib.h for malloc, free and realloc, but was
previously getting it only via the OpenSSL headers that it was
including.
BoringSSL, in the future, will be tider about what it includes via its
headers and so this file will need to include stdlib.h itself.
(cherry picked from commit 2544611b6f37e69955fe7161995b7bacf3ae8fba)
Bug: 21085331
Change-Id: I864c679ba5a9f0041dd49d063ad1190ffa87b30a
|
|
|
|
|
| |
bug: 19572107
Change-Id: I5ba0a434b016e8dc376f7d0eef5cf76b99ab50fd
|
|
|
|
|
|
|
|
| |
In support of unprefixed EME
bug: 19771612
bug: 19771431
Change-Id: Ib19d4c8db25f5b09f9a30ebd4992b668cad9bfc4
|
|
|
|
|
| |
bug: 19771299
Change-Id: I02f0a4532b5ea8a7e680d71f45ac0da06879f3d6
|
|\
| |
| |
| |
| | |
* commit '64b08d230c94872e014831bdb7b8a323c4b584ec':
Remove superfluous OpenSSL include paths.
|
| |
| |
| |
| |
| |
| |
| |
| | |
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.
Change-Id: If9df76e6fefb7419cbb2fb33a0264626c748561e
|
|\ \
| |/
| |
| | |
Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
to use the new static version.
Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
Conflicts:
media/libmedia/IAudioFlinger.cpp
media/libmedia/IMediaPlayer.cpp
media/libstagefright/CameraSource.cpp
|
|\ \
| |/
| |
| |
| | |
* commit '2f702c9bc0d07f5d48f6f50586b1e11d9ac59381':
Move to libc++.
|
| |
| |
| |
| |
| |
| |
| | |
This also cleans up some makefile cruft.
Bug: 15193147
Change-Id: Ia53ca4f6fb2153f4e77e6f696eb27dcaae73a78e
|
| |\
| | |
| | |
| | |
| | | |
* commit 'ac4d8b31d4c7785ccaed28977e05e158d554ce38':
Remove dead code.
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
* commit '3a94ca562e6a57cf324a8b8165b596ad61f7a20d':
Fix comparison of String8 to char* literal
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
* commit '9707ffaf0b574b7929d62b2fe683595e95ef7774':
Check for NULL before calling asBinder().
|
|\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* commit '3b97d9d787ba3913ce7e9b1e0ddd0b938e5bf979':
Fix build, update mock drm plugin
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Bug: 18280078
(cherry picked from commit 85c737a67e1b679251fce7f456ae79eefdc15e07)
Change-Id: I341981e71d87be666787d9c866fc71a6b758c0e9
|
|\ \ \ \ \ \
| |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
lmp-mr1-dev
* commit '7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe':
Add missing secure stop methods
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
b/18053197
b/18076411
Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
|
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | |
| | | | | |
| | | | | | |
* commit 'ac4d8b31d4c7785ccaed28977e05e158d554ce38':
Remove dead code.
|
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | | |
BUG: 17364950
Change-Id: I7c55fd918a8c0d1a3375807eaece9ae9176ffeea
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | | |
* commit '3a94ca562e6a57cf324a8b8165b596ad61f7a20d':
Fix comparison of String8 to char* literal
|
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Clang (correctly) interprets
if ("." == sName)
as
if ("." == (const char*)sName)
and recognizes that comparing the pointers isn't what was meant.
With
if (sName == ".")
both clang and gcc see and use String8::operator==(const char *),
ensuring we get the wanted behavior.
Change-Id: Ide240e13214a56f6899f72de3db75dac647e6d4b
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
|
|\ \ \ \ \
| |/ / / /
| | | | /
| |_|_|/
|/| | | |
* commit '9707ffaf0b574b7929d62b2fe683595e95ef7774':
Check for NULL before calling asBinder().
|
| |/ /
| | |
| | |
| | |
| | |
| | | |
The old asBinder() checked if this == NULL, which is undefined behavior.
Change-Id: Ibde628395ca10dfef0d2f59e81280576f104b83c
|
|\ \ \
| | |/
| |/|
| | |
| | | |
* commit 'c2320223222fe4507b6d67f6b8b4001d26c77a9c':
Fix build break in mock drm plugin build
|
| | |
| | |
| | |
| | | |
Change-Id: I8ae5d378df694360be3d76e06512e2ebc9fc0572
|
|\ \ \
| |/ /
| | |
| | |
| | | |
* commit 'b63d63b8afa25694d1973988d7acdfebcd01a18d':
Allow device to be unprovisioned
|
| | |
| | |
| | |
| | |
| | | |
bug: 12247651
Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
|
|\ \ \
| |/ /
|/| /
| |/
| | |
* commit 'bb5b41a39f7e93a8df444ae0a1c71495531d265e':
Add SELinux MAC to DrmManagerService.
|
| |
| |
| |
| |
| |
| |
| | |
Add SELinux checks on all interfaces exposed by the
DrmManagerService.
Change-Id: Ib170d3229d88781b76e5fc1c557c8fed233df5d1
|
| |
| |
| |
| |
| | |
bug: 12724697
Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13
|
| |
| |
| |
| |
| |
| |
| |
| | |
To run individual test suite, follow the example shown below:
adb shell LD_LIBRARY_PATH=/system/vendor/lib/mediadrm /system/bin/ClearKeyDrmUnitTest
--gtest_filter=JsonWebKeyTest.*
Change-Id: I8ecc944a734cde351505a7cd8c3997976d74553b
|
| |
| |
| |
| | |
Change-Id: I45ee7efb13ffaff8c15ce6b2aea3076db713c73e
|
| |
| |
| |
| | |
Change-Id: I0008a01d29ade169df9a0fd30ca0303adf9ecad3
|
| |
| |
| |
| |
| |
| |
| | |
Adds shared-object entry points and interface implementations that
implement the Android ClearKey DRM Plugin API.
Change-Id: Ie889747492cf85efe883149833105538faaa4cfe
|
| |
| |
| |
| |
| |
| |
| |
| | |
Parses JSON Web Key Set in the response data; extracts and base64 decode
key id(s) and key(s).
bug: 12035506
Change-Id: Ib71bce942d6eca1e569dfad0a9adb6dee1cdf75e
|
| |
| |
| |
| |
| |
| |
| | |
Implements an object that can convert ISO-CENC or WebM initialization
data into a ClearKey license request.
Change-Id: Ib95012afcf40fc9e3f45510a468c305fb7bc216e
|
| |
| |
| |
| |
| |
| | |
Implements an object that does AES-CTR-128 by invoking OpenSSL.
Change-Id: I8457899ec8b69bd8f0d727029985c9580911cf99
|
| |
| |
| |
| |
| |
| |
| | |
Adds some utility functionality that is shared by multiple parts of
the ClearKey code.
Change-Id: I33a896eb68b2937918f145c9bd27174a119294b9
|
| |
| |
| |
| |
| | |
bug: 12724697
Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
no DRM service exists" into klp-modular-dev
* commit '4299a7c2b049b07b3456a81a4c2b1030523c08ca':
Implement a NoOp DrmManagerClientImpl when no DRM service exists
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
service exists" into klp-modular-dev
* commit '940f8be3619cecda66dad33f995904795df88c2d':
Implement a NoOp DrmManagerClientImpl when no DRM service exists
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ib06f429102a51c540c8132f3397130328279e03a
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | | |
* commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | | |
* commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
|