| d556fad7475f4cd05a2199e9716ed8e01aa0ea9b |
06-Nov-2014 |
Jeff Tinker <jtinker@google.com> |
Fix build, update mock drm plugin
Bug: 18280078
(cherry picked from commit 85c737a67e1b679251fce7f456ae79eefdc15e07)
Change-Id: I341981e71d87be666787d9c866fc71a6b758c0e9
ediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
ediadrm/plugins/mock/MockDrmCryptoPlugin.h
|
| 3c1285e8f86bd497e14c14fb6df7b42072ef52bd |
31-Oct-2014 |
Jeff Tinker <jtinker@google.com> |
Add missing secure stop methods
b/18053197
b/18076411
Change-Id: I923dc893d48c70bf17980007b32f0ac5dfd22896
ediadrm/plugins/clearkey/DrmPlugin.h
|
| c2320223222fe4507b6d67f6b8b4001d26c77a9c |
05-Aug-2014 |
Jeff Tinker <jtinker@google.com> |
Fix build break in mock drm plugin build
Change-Id: I8ae5d378df694360be3d76e06512e2ebc9fc0572
ediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
ediadrm/plugins/mock/MockDrmCryptoPlugin.h
|
| 68b15554f6dca3b056eac517fe5fa2fd4ee80a33 |
30-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
Allow device to be unprovisioned
bug: 12247651
Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e
ediadrm/plugins/clearkey/DrmPlugin.h
|
| 4ebf92c0418584f1bb5ab3e83e8398351f4c05e5 |
01-Jul-2014 |
Edwin Wong <edwinwong@google.com> |
Create a single test binary.
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
ediadrm/plugins/clearkey/tests/Android.mk
ediadrm/plugins/clearkey/tests/unit-test.mk
|
| 2421a4ba309f082a83be9b8e385c00cd8e0043f6 |
01-Jul-2014 |
Edwin Wong <edwinwong@google.com> |
Fix build target path.
Change-Id: I45ee7efb13ffaff8c15ce6b2aea3076db713c73e
ediadrm/plugins/clearkey/Android.mk
ediadrm/plugins/clearkey/tests/unit-test.mk
|
| 8d0bc4a8ea2a5d0d6aba036f15b185d60e18778f |
23-Jun-2014 |
John "Juce" Bruce <juce@google.com> |
Add Unit Tests for ClearKey Plugin
Change-Id: I0008a01d29ade169df9a0fd30ca0303adf9ecad3
ediadrm/plugins/clearkey/Android.mk
ediadrm/plugins/clearkey/tests/AesCtrDecryptorUnittest.cpp
ediadrm/plugins/clearkey/tests/Android.mk
ediadrm/plugins/clearkey/tests/InitDataParserUnittest.cpp
ediadrm/plugins/clearkey/tests/unit-test.mk
|
| 1fe11a5d1b7932a8a4a4e6e8cf1aedd21fcdb3aa |
14-May-2014 |
John "Juce" Bruce <juce@google.com> |
ClearKey Implementation of DRM Plugin APIs
Adds shared-object entry points and interface implementations that
implement the Android ClearKey DRM Plugin API.
Change-Id: Ie889747492cf85efe883149833105538faaa4cfe
ediadrm/plugins/clearkey/Android.mk
ediadrm/plugins/clearkey/ClearKeyUUID.cpp
ediadrm/plugins/clearkey/ClearKeyUUID.h
ediadrm/plugins/clearkey/CreatePluginFactories.cpp
ediadrm/plugins/clearkey/CreatePluginFactories.h
ediadrm/plugins/clearkey/CryptoFactory.cpp
ediadrm/plugins/clearkey/CryptoFactory.h
ediadrm/plugins/clearkey/CryptoPlugin.cpp
ediadrm/plugins/clearkey/CryptoPlugin.h
ediadrm/plugins/clearkey/DrmFactory.cpp
ediadrm/plugins/clearkey/DrmFactory.h
ediadrm/plugins/clearkey/DrmPlugin.cpp
ediadrm/plugins/clearkey/DrmPlugin.h
ediadrm/plugins/clearkey/Session.cpp
ediadrm/plugins/clearkey/Session.h
ediadrm/plugins/clearkey/SessionLibrary.cpp
ediadrm/plugins/clearkey/SessionLibrary.h
|
| 7bdf28d2b83e527f474e96b0984d6a3f5eb457f7 |
16-May-2014 |
Edwin Wong <edwinwong@google.com> |
JsonWebKey support.
Parses JSON Web Key Set in the response data; extracts and base64 decode
key id(s) and key(s).
bug: 12035506
Change-Id: Ib71bce942d6eca1e569dfad0a9adb6dee1cdf75e
ediadrm/plugins/clearkey/JsonWebKey.cpp
ediadrm/plugins/clearkey/JsonWebKey.h
ediadrm/plugins/clearkey/tests/Android.mk
ediadrm/plugins/clearkey/tests/JsonWebKeyUnittest.cpp
ediadrm/plugins/clearkey/tests/unit-test.mk
|
| 6b3c1473199927264691bb50445cf0b35c2f8892 |
11-Jun-2014 |
John "Juce" Bruce <juce@google.com> |
Implement ClearKey Init Data Parser
Implements an object that can convert ISO-CENC or WebM initialization
data into a ClearKey license request.
Change-Id: Ib95012afcf40fc9e3f45510a468c305fb7bc216e
ediadrm/plugins/clearkey/Android.mk
ediadrm/plugins/clearkey/InitDataParser.cpp
ediadrm/plugins/clearkey/InitDataParser.h
|
| 16dfdcff6e4bb025220b88d5fc132ae48e7cb437 |
11-Jun-2014 |
John "Juce" Bruce <juce@google.com> |
Implement OpenSSL-Based Decryptor
Implements an object that does AES-CTR-128 by invoking OpenSSL.
Change-Id: I8457899ec8b69bd8f0d727029985c9580911cf99
ediadrm/plugins/clearkey/AesCtrDecryptor.cpp
ediadrm/plugins/clearkey/AesCtrDecryptor.h
ediadrm/plugins/clearkey/Android.mk
ediadrm/plugins/clearkey/ClearKeyTypes.h
|
| 47a86fb32803a37f03a40e4ea13e1f7db6cd728d |
16-May-2014 |
John "Juce" Bruce <juce@google.com> |
Add ClearKey Utilities
Adds some utility functionality that is shared by multiple parts of
the ClearKey code.
Change-Id: I33a896eb68b2937918f145c9bd27174a119294b9
ediadrm/plugins/clearkey/Android.mk
ediadrm/plugins/clearkey/ClearKeyTypes.h
ediadrm/plugins/clearkey/Utils.cpp
ediadrm/plugins/clearkey/Utils.h
|
| b710094cc9fe5eaf4b00b091ba024e2a6837a7c3 |
18-Jun-2014 |
Jeff Tinker <jtinker@google.com> |
Fix Externally reported security issue
bug: 12724697
Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13
rmserver/DrmManagerService.cpp
|
| 31dcd338b3826928646d77f23f977ecdd52598a3 |
10-Jun-2014 |
Adam Lesinski <adamlesinski@google.com> |
am 4299a7c2: am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
* commit '4299a7c2b049b07b3456a81a4c2b1030523c08ca':
Implement a NoOp DrmManagerClientImpl when no DRM service exists
|
| 4299a7c2b049b07b3456a81a4c2b1030523c08ca |
09-Jun-2014 |
Adam Lesinski <adamlesinski@google.com> |
am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM service exists" into klp-modular-dev
* commit '940f8be3619cecda66dad33f995904795df88c2d':
Implement a NoOp DrmManagerClientImpl when no DRM service exists
|
| 927634a98167e24241b89d80a1ea4511c0bb9cd1 |
05-Jun-2014 |
Adam Lesinski <adamlesinski@google.com> |
Implement a NoOp DrmManagerClientImpl when no DRM service exists
Change-Id: Ib06f429102a51c540c8132f3397130328279e03a
ibdrmframework/Android.mk
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/NoOpDrmManagerClientImpl.cpp
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/NoOpDrmManagerClientImpl.h
|
| 1b24cf32e02a1372e57b3a2a432bc0adfe496e6d |
16-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
|
| e80631aa1992ca50af679cd6a018c0ffda7f9b17 |
16-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
|
| 3ab368e0810d894dcbc0971350c095049478a055 |
15-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
media: use size_t for integer iterator to Vector::size()
Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
ommon/DrmSupportInfo.cpp
rmserver/DrmManager.cpp
ibdrmframework/include/PlugInManager.h
|
| 99021c47f45ee8bf3317cff7d08226e76c8d8227 |
02-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrm
* commit 'f356a123bf966150965a1af1cb9bd6ff2ca020de':
Support CAST V2 Authentication in MediaDrm
|
| f356a123bf966150965a1af1cb9bd6ff2ca020de |
02-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
am 68d9d71a: Support CAST V2 Authentication in MediaDrm
* commit '68d9d71a792deed75d32fe13febc07c9c12c8449':
Support CAST V2 Authentication in MediaDrm
|
| 68d9d71a792deed75d32fe13febc07c9c12c8449 |
04-Mar-2014 |
Jeff Tinker <jtinker@google.com> |
Support CAST V2 Authentication in MediaDrm
Java API version
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861
related-to-bug: 12702350
ediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
ediadrm/plugins/mock/MockDrmCryptoPlugin.h
|
| 37e05edf1cfe297f9c7d382787ecab53d5a2b5c8 |
18-Mar-2014 |
Glenn Kasten <gkasten@android.com> |
am 9a9481f8: am 0e7e5db7: Merge "More 32-bit only"
* commit '9a9481f89b26211b20d7f3fde3d54b455843bf70':
More 32-bit only
|
| 0e56849007a0f128201e545b610f119217b41376 |
14-Mar-2014 |
Glenn Kasten <gkasten@android.com> |
More 32-bit only
Change-Id: Ic333215e39757f91b12d66b8a9ad7f43c8ba8b36
rmserver/Android.mk
|
| 9d79834400009f690d04726d2bb746a9e8281ede |
26-Feb-2014 |
Ying Wang <wangying@google.com> |
am e0a76795: am 5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"
* commit 'e0a76795125a81471c408d4a23112e98ae2f0ae3':
Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
|
| f2d170f6790329dd73c61b8704055e1dff4112a2 |
26-Feb-2014 |
Ying Wang <wangying@google.com> |
Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
Change-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6
ediadrm/plugins/mock/Android.mk
|
| 1d6fa7af1288b550faabe4ec2cf98684236723db |
11-Feb-2014 |
Narayan Kamath <narayan@google.com> |
resolved conflicts for merge of 566be7c3 to master
Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
|
| 377b2ec9a2885f9b6405b07ba900a9e3f4349c38 |
03-Feb-2014 |
Kévin PETIT <kevin.petit@arm.com> |
Make frameworks/av 64-bit compatible
Contains the necessary changes to make frameworks/av build and work
on a 64-bit machine.
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
ediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 9be49c915852b592a881be3905658e4fc698749d |
28-Jan-2014 |
Colin Cross <ccross@android.com> |
am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"
* commit 'bb9e396d311ea38e958fb5b56efff7aea4eaed82':
frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
|
| 7d6fc5ebc8718ebb5bf505d9bda83ab63741a545 |
25-Jan-2014 |
Colin Cross <ccross@android.com> |
frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_PATH doesn't work for multiarch builds, replace it
with LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
ibdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
|
| 817d4aa19e6a9c95ec20486e6d74dea5a38e7236 |
08-Nov-2013 |
Robert Shih <robertshih@google.com> |
Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType.
Bug: 11534051
Change-Id: I0ab56b0a96b30f721bcac1d1ccc6ca85c3271ef5
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| 34486800a022857b45c3882624449980c5cb6907 |
12-Sep-2013 |
Jeff Tinker <jtinker@google.com> |
Fix MediaDrm cts tests
Moving the build of the mock MediaDrm plugin back to
frameworks/av since it can't be installed by cts.
b/10668350
Change-Id: Id662bdb0775389b458f86a299392217f2d959422
ediadrm/plugins/mock/Android.mk
ediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
ediadrm/plugins/mock/MockDrmCryptoPlugin.h
|
| 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
ommon/DrmInfoEvent.cpp
ommon/IDrmServiceListener.cpp
|
| ee7e77d55d510725a314d8ed36dc730c21af6173 |
29-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
fix MediaDrm.isCryptoSchemeSupported(uuid)
1. Don't expect plugins to support an empty mimeType in isContentTypeSupported
2. Move the cts test mock drm plugin to the cts tree so it is always used
b/10528466
Change-Id: I6023f6165b1e9d294986f7e5cd0896e056e376f1
ediadrm/plugins/mock/Android.mk
ediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
ediadrm/plugins/mock/MockDrmCryptoPlugin.h
|
| 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)
ommon/DrmInfoEvent.cpp
ommon/IDrmServiceListener.cpp
|
| 9cf69e0fc110f17c28e988ed0f9bf91abfaf710d |
21-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Add ability to test supported content types to MediaDrm
bug: 10244066
Change-Id: I317f05b146db962c271893f6208890a5a6c396f1
ediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
ediadrm/plugins/mock/MockDrmCryptoPlugin.h
|
| f355f18aa2cc1706761e373fe19298a9ccc9c75a |
23-Jul-2013 |
Jeff Tinker <jtinker@google.com> |
Remove obsolete drm manager code
bug: 9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
ommon/IDrmManagerService.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/DrmManagerService.h
ibdrmframework/include/IDrmManagerService.h
|
| 423e33ce6569cb14ecf772e9670208517f7b30c4 |
09-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Added CTS test for secure stop APIs
bug: 8604418
Change-Id: I173fa1ec904ba11dc4cff0343462b3f4bac0d365
ediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6 |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
Add liblog
Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
rmserver/Android.mk
ibdrmframework/Android.mk
ibdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
ibdrmframework/plugins/passthru/Android.mk
ediadrm/plugins/mock/Android.mk
|
| c0d5f1f8405de861ed6f1725f26cd6601e7103ab |
02-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Implement async event callout from drm plugin to Java app
Change-Id: I007f147d693664e777b8758be2bb8a4c7ec0236b
ediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
|
| 4c63a239c404af1e055e5f9939939ab0fd09d98a |
31-Mar-2013 |
Jeff Tinker <jtinker@google.com> |
MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.
Change-Id: I5d8000ce7e1dd7eba08969fc50296c9e1456c4fc
ediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
ediadrm/plugins/mock/MockDrmCryptoPlugin.h
|
| 441a78d5e224e0d67f9b52fa9adc795c6944159b |
08-Feb-2013 |
Jeff Tinker <jtinker@google.com> |
Implementing MediaDrm APIs
Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6
ediadrm/plugins/mock/Android.mk
ediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
ediadrm/plugins/mock/MockDrmCryptoPlugin.h
|
| 558d60e4e2217e02b3e7adf7afaf51d1c6e08f91 |
15-Jul-2012 |
Henrik B Andersson <henrikb.andersson@sonymobile.com> |
Remove unnecessary lib dependencies in the FL makefile
Change-Id: Ia1e81a91b4b8dc1bf3558a4aa06e90a955c6fbe6
ibdrmframework/plugins/forward-lock/internal-format/converter/Android.mk
ibdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk
|
| 2d45dbd1910a7e51d383e8583017e6f26cd3498a |
05-Jun-2012 |
Hung Nguyen <hung.nguyen@sonymobile.com> |
Fixed bugs where the content of buffer holding keys was cleared using a wrong size in forward lock
Modified by James Dong <jdong@google.com>
Change-Id: Iaacfc79b2b26bdee7046d8555e3b4e0bc224c3c5
ibdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.c
ibdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.c
|
| 0bf43848adb00922122b0a0eed2fa0318bde8317 |
05-Jun-2012 |
Hung Nguyen <hung.nguyen@sonymobile.com> |
Fixed memory leakage in the DRM framework
Change-Id: Ib1276bec6cafb4e94f8f13b52e50e4987765eec4
ommon/IDrmManagerService.cpp
ommon/ReadWriteUtils.cpp
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| 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
rmserver/DrmManager.cpp
ibdrmframework/include/DrmManager.h
|
| 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
ommon/IDrmManagerService.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
ommon/DrmEngineBase.cpp
ommon/IDrmManagerService.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/DrmManagerService.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/plugins/common/include/DrmEngineBase.h
ibdrmframework/plugins/common/include/IDrmEngine.h
ibdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
ibdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.c
ibdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.h
ibdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| 9352d1168c09903d4ea27b695ef683316c544ae5 |
09-Aug-2012 |
James Dong <jdong@google.com> |
Remove some unused forward lock code
Change-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c
ibdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.c
ibdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.h
|
| 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
ommon/MODULE_LICENSE_APACHE2
ommon/NOTICE
rmserver/MODULE_LICENSE_APACHE2
rmserver/NOTICE
ibdrmframework/MODULE_LICENSE_APACHE2
ibdrmframework/NOTICE
ibdrmframework/plugins/common/util/MODULE_LICENSE_APACHE2
ibdrmframework/plugins/common/util/NOTICE
ibdrmframework/plugins/forward-lock/FwdLockEngine/MODULE_LICENSE_APACHE2
ibdrmframework/plugins/forward-lock/FwdLockEngine/NOTICE
ibdrmframework/plugins/passthru/MODULE_LICENSE_APACHE2
ibdrmframework/plugins/passthru/NOTICE
|
| 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
ommon/DrmEngineBase.cpp
ommon/IDrmManagerService.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/DrmManagerService.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/plugins/common/include/DrmEngineBase.h
ibdrmframework/plugins/common/include/IDrmEngine.h
|
| 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
rmserver/DrmManagerService.cpp
|
| ed5b285520ae1ddad78b7c945d659a2c1f3140b8 |
09-Apr-2012 |
Ying Wang <wangying@google.com> |
You don't need LOCAL_SHARED_LIBRARIES/LOCAL_STATIC_LIBRARIES to build a static library.
Change-Id: Ia2c4b4fb3b78cbe0d2856cec073b2c7f9c28d3cb
ibdrmframework/plugins/common/util/Android.mk
|
| cec40f97a8c0b9a43a78ae98fc35fcc80d6f6c4f |
29-Mar-2012 |
James Dong <jdong@google.com> |
Removed unnecessary include JNI from two drm Android.mk files
Change-Id: I7b7a1acce4d6db748ff193270e73bc3582ba2380
ibdrmframework/plugins/common/util/Android.mk
ibdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
|
| 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
ommon/Android.mk
rmserver/Android.mk
ibdrmframework/Android.mk
ibdrmframework/plugins/common/util/Android.mk
ibdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
ibdrmframework/plugins/forward-lock/internal-format/converter/Android.mk
ibdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk
ibdrmframework/plugins/passthru/Android.mk
|
| 27e52c70cf02ee5f7f6b49df80674c5fbf8a7a2e |
14-Mar-2012 |
James Dong <jdong@google.com> |
Merge "make sure that lower-case mime and file suffix is used to check against the supported ones"
|
| 75979dc147c4d2f832730da2e9b68d93ce892ba3 |
14-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Fixed a buffer overflow bug in DrmPassthruPlugin"
|
| 35250664455c9642cc14d3831b663880637a7d70 |
14-Mar-2012 |
James Dong <jdong@google.com> |
Fixed a buffer overflow bug in DrmPassthruPlugin
Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| 0a38af09ebbacdc9aa0d5ecb24e2f0484bf4f191 |
14-Mar-2012 |
James Dong <jdong@google.com> |
Turned off log spamming from DrmPassthruPlugin
Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| ad6ec91c0bca37587e28bf72dfc38cde1b90544f |
13-Mar-2012 |
James Dong <jdong@google.com> |
make sure that lower-case mime and file suffix is used to check against the supported ones
Change-Id: I6a20832f6a2dfb8554dbddef0dee87cc21c05c80
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| f67fdc6d8bb31226ffeeecbff6aca610befd0110 |
12-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Avoid checking supported mime types or file suffixes in multiple places"
|
| bd2f13ddbe7a9e7550205f6b53880329e09b9457 |
10-Mar-2012 |
James Dong <jdong@google.com> |
Avoid checking supported mime types or file suffixes in multiple places
Change-Id: I47d24070c7bda385cd1d7fa1f6a75dbb1f82b476
ibdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
ibdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngineConst.h
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| 9c78e8681dafcdf265bc733875bad436ef9ec220 |
09-Mar-2012 |
James Dong <jdong@google.com> |
Added an failure log message when the fwdlock engine fails to open a given file.
Change-Id: I0e7f60b61f03fde046fc1ad668b28cdee635898b
ibdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.c
|
| 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
rmserver/DrmManagerService.cpp
|
| d907e9451ec3c7b2244dd5605f1a26ab23466a7a |
28-Feb-2012 |
James Dong <jdong@google.com> |
Remove unnecessary header file includes for drmserver
Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
rmserver/main_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
ommon/DrmEngineBase.cpp
ommon/IDrmManagerService.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/DrmManagerService.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/plugins/common/include/DrmEngineBase.h
ibdrmframework/plugins/common/include/IDrmEngine.h
|
| 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
ommon/ReadWriteUtils.cpp
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| 5ff1dd576bb93c45b44088a51544a18fc43ebf58 |
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
ibdrmframework/DrmManagerClientImpl.cpp
|
| b8a805261bf0282e992d3608035e47d05a898710 |
20-Dec-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
ibdrmframework/plugins/common/util/src/MimeTypeUtil.cpp
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.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
rmserver/DrmManager.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
rmserver/DrmManager.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
rmserver/main_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
ommon/DrmMetadata.cpp
ommon/IDrmManagerService.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.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
rmserver/DrmManager.cpp
|
| cfff1f2b0bac432fac49f0b21e09e08f0e913622 |
05-Aug-2011 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of 845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
|
| e3c56d16412882e2dac697fbe6fa9852ee4dee31 |
04-Aug-2011 |
Gloria Wang <gwang@google.com> |
am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '8a6fb50d69ec40a413b117bc9145a97ec427852f':
Bug fixes in OMA DRM v1 Forward Lock Agent
|
| 90855078eb989944bca1824058d7231cd68e5021 |
21-Feb-2011 |
Henrik B Andersson <henrikb.andersson@sonyericsson.com> |
Bug fixes in OMA DRM v1 Forward Lock Agent
A couple of fixes in the Forward Lock Agent.
The DRM Framework isn't thread safe so the Forward Lock Agent needs
to protect the private structures.
Base64-encoded content with LF-only instead of CRLF line breaks is now
accepted.
A fix for non-standard boundary characters.
The debug prints are also turned off as default.
Change-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f
ibdrmframework/plugins/common/util/include/SessionMap.h
ibdrmframework/plugins/common/util/src/MimeTypeUtil.cpp
ibdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
ibdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.c
ibdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.c
|
| 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
ommon/IDrmManagerService.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
ommon/IDrmManagerService.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/DrmManagerService.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/plugins/common/include/DrmEngineBase.h
|
| 5e0067b486c3862316aa1f293cf9690c0cf54bda |
12-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
rmserver/Android.mk
ibdrmframework/Android.mk
ibdrmframework/plugins/passthru/Android.mk
|
| 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
ommon/DrmSupportInfo.cpp
ommon/IDrmManagerService.cpp
ibdrmframework/DrmManagerClientImpl.cpp
|
| 185a19319e61ccd5e8806b7d00a20192dbcaf1f8 |
21-Jun-2011 |
Gloria Wang <gwang@google.com> |
Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."
|
| 409e5a07f044239aac2059c9ba3b3f6f48eeaba1 |
21-Jun-2011 |
Gloria Wang <gwang@google.com> |
Fix a memory leak in the Forward Lock plugin.
For bug 4770217.
Change-Id: I14f4d4ead524c661e68a20738e7a50e4d8fd92ea
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| daeba2d6b9df5252afacec835a23340e5d9910ec |
16-Jun-2011 |
Gloria Wang <gwang@google.com> |
Merge "-Fix some typo -Remove one unnecessary memory allocation"
|
| c10ce33302f91896fc2a87c13b00518a4bc26e3a |
15-Jun-2011 |
Gloria Wang <gwang@google.com> |
-Fix some typo
-Remove one unnecessary memory allocation
Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
ommon/IDrmManagerService.cpp
ibdrmframework/include/PlugInManager.h
|
| b432603d711cd504d0de62f7fbb095b90c9a4283 |
14-Jun-2011 |
Gloria Wang <gwang@google.com> |
To remove log spam in the Forward Lock DRM plugin.
Fix for bug 4619159.
Change-Id: Id4984aade4cceb59a1fdf904949f62535decd2a4
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| 50872c0b6563b75bb02e0de2fd578b40db8227db |
14-Jun-2011 |
Gloria Wang <gwang@google.com> |
Duplicated fileDesc is not closed when input file is not forward-lock content.
Fix for bug 4606053.
Change-Id: I1b45457d8cdc75d268631911f46ce6ec931b1770
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| adfb5592622305090ad39dcc2b7df477736da2c6 |
24-Apr-2011 |
James Dong <jdong@google.com> |
Fix memory leak from retrieval of getSupportedDrmInfo.
Change-Id: Ic2192a9791c0a3c5e5357b4367a2d8bfb15af20c
rmserver/DrmManager.cpp
|
| 277360f06bdfefe821d4ddde8876f8e2507887c3 |
25-Mar-2011 |
Gloria Wang <gwang@google.com> |
am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1
* commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3':
Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
|
| 25cd5788a70f45c807ad22aa0ecdc7e1d4d5fd67 |
24-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 4126624.
Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
Change-Id: I7aacea1bc58ab6425ef6f6f09472c6f2970ebb4d
ibdrmframework/DrmManagerClient.cpp
|
| 07d0220bcc9036bcbe36819912559267d9c1c538 |
24-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for bug 4165823.
Add death listener to clean-up drmserver appropriately when drmserver died.
Cherry-pick from master. Do not merge.
Change-Id: I7782cc96ce173a87ebfd315950f3880fa90294d6
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManagerClientImpl.h
|
| 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
ommon/DrmSupportInfo.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
ommon/IDrmManagerService.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
ommon/IDrmManagerService.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
ommon/IDrmManagerService.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
ommon/DrmInfoEvent.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
rmserver/DrmManager.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/plugins/common/include/IDrmEngine.h
|
| 8635b7b095fbf7ffc63d3ce791891a9116ace1f6 |
15-Mar-2011 |
James Dong <jdong@google.com> |
Add memory leak tracking/debugging code to drm server
bug - 4099038
Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
rmserver/Android.mk
rmserver/DrmManagerService.cpp
ibdrmframework/include/DrmManagerService.h
|
| 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
ommon/DrmSupportInfo.cpp
rmserver/Android.mk
rmserver/StringTokenizer.cpp
ibdrmframework/include/PlugInManager.h
ibdrmframework/include/StringTokenizer.h
|
| 9691a73139bb36c5bf294ed13eedcb04d7f05320 |
14-Mar-2011 |
Iliyan Malchev <malchev@google.com> |
frameworks/base: remove LOCAL_PRELINK_MODULE
Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
ibdrmframework/Android.mk
ibdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
ibdrmframework/plugins/passthru/Android.mk
|
| 1825ce2475d4cbed336ddb779ab5acb09d9a155c |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of c761a80d to master
Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
|
| 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
rmserver/DrmManager.cpp
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/include/DrmManager.h
|
| 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
ommon/IDrmManagerService.cpp
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManagerClientImpl.h
|
| 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
ommon/IDrmManagerService.cpp
rmserver/DrmManager.cpp
|
| 7f89d09c0f4a47119834ba15789260b933123ea5 |
02-Mar-2011 |
Gloria Wang <gwang@google.com> |
To support DRM files without file extension
Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c
ommon/DrmSupportInfo.cpp
rmserver/DrmManager.cpp
|
| 1de41a66e3e7b548ee44e6654580e5f6f7265b11 |
19-Feb-2011 |
Gloria Wang <gwang@google.com> |
Move all Widevine code which have dependency on vendor modules to vendor/widevine
Change-Id: If75bce539bae02117fb4f628be64e3a7363375e9
ibdrmframework/plugins/widevine/Android.mk
ibdrmframework/plugins/widevine/include/WVMDrmPlugin.h
ibdrmframework/plugins/widevine/include/WVMLogging.h
ibdrmframework/plugins/widevine/src/WVMDrmPlugin.cpp
ibdrmframework/plugins/widevine/src/WVMLogging.cpp
ibdrmframework/plugins/widevine/test/Android.mk
ibdrmframework/plugins/widevine/test/TestPlugin.cpp
ibdrmframework/plugins/widevine/test/kill.sh
|
| d4366e89e46317673a97516ee2d25768038dc444 |
15-Feb-2011 |
Gloria Wang <gwang@google.com> |
- Update from Widevine
- Bug fixes
Change-Id: I494cfe145e7aad36f3d8c68841cab847487dd85b
ibdrmframework/plugins/widevine/Android.mk
ibdrmframework/plugins/widevine/include/WVMDrmPlugin.h
ibdrmframework/plugins/widevine/include/WVMLogging.h
ibdrmframework/plugins/widevine/src/WVMDrmPlugin.cpp
ibdrmframework/plugins/widevine/src/WVMLogging.cpp
ibdrmframework/plugins/widevine/test/Android.mk
ibdrmframework/plugins/widevine/test/TestPlugin.cpp
ibdrmframework/plugins/widevine/test/kill.sh
|
| 44482001e106cfb7389110f869ddae381f8a2da7 |
21-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3361124 Remove drmioserver, continued
Change-Id: I525b7a3ac1a79d3aaa1d3c7853df1c903b38b7c0
ommon/Android.mk
ommon/IDrmIOService.cpp
ibdrmframework/include/DrmIOService.h
ibdrmframework/include/IDrmIOService.h
|
| e21495572bebb9c7b5fad745ca1516e53e8fd395 |
20-Jan-2011 |
Gloria Wang <gwang@google.com> |
am 113529f0: am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb
* commit '113529f062c43b111efbbd1382e23befdd1cdd30':
More fix for 64 bit offset.
|
| 5cc52d46226bf1ab6faa8910413153c0b86dc5c9 |
20-Jan-2011 |
Gloria Wang <gwang@google.com> |
am a4b0cdc9: Merge "More fix for 64 bit offset." into honeycomb
* commit 'a4b0cdc96e309168517f4b4da24b7647668f99a7':
More fix for 64 bit offset.
|
| 2ed8a921ef55aa2f3dd4b7ac33b7ded6ec33d92d |
20-Jan-2011 |
Gloria Wang <gwang@google.com> |
More fix for 64 bit offset.
Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
ommon/IDrmManagerService.cpp
|
| 0a32d7981b98fdfca48a1e35ca746f1cc11849d3 |
19-Jan-2011 |
Gloria Wang <gwang@google.com> |
rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/
Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
ibdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
|
| 507ac2ecfe044646f361ce4b0e9034b3d1094ef1 |
13-Jan-2011 |
Gloria Wang <gwang@google.com> |
am c35b3268: am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit 'c35b3268919e6201f269eb9011ae184c5f613bc3':
Initial OMA DRM forward lock contribution
|
| 6508ec903e7b6596a3b8167e3b18d0b966ea1b8f |
13-Jan-2011 |
Gloria Wang <gwang@google.com> |
am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394':
Initial OMA DRM forward lock contribution
|
| 13e05b3f569965d97ec7d7f65e4cd46c6a22c23d |
13-Jan-2011 |
Gloria Wang <gwang@google.com> |
Merge "Initial OMA DRM forward lock contribution"
|
| 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
rmserver/DrmManager.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.
|
| fdd65a0fc7df2c878cc601e4c0f4021cb264f051 |
05-Jan-2011 |
Pravat Dalbehera <pravat.dalbehera@sonyericsson.com> |
Initial OMA DRM forward lock contribution
OMA DRM forward lock agent is plugged into the
Open DRM framework. Forward lock agent implementation contains:
- Forward lock engine to communicate with framework
- Converter to encrypt the original file into a special format
- Decoder to feed the decrypted data for rendering
- Lightweight unique key-encryption mechanism
- Documentation
Change-Id: Id828ebc30b8147b58b14960a73571648bc01ae94
ibdrmframework/plugins/common/Android.mk
ibdrmframework/plugins/common/util/Android.mk
ibdrmframework/plugins/common/util/include/MimeTypeUtil.h
ibdrmframework/plugins/common/util/include/SessionMap.h
ibdrmframework/plugins/common/util/src/MimeTypeUtil.cpp
ibdrmframework/plugins/forward-lock/Android.mk
ibdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
ibdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
ibdrmframework/plugins/forward-lock/FwdLockEngine/include/FwdLockEngineConst.h
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
ibdrmframework/plugins/forward-lock/internal-format/Android.mk
ibdrmframework/plugins/forward-lock/internal-format/common/Android.mk
ibdrmframework/plugins/forward-lock/internal-format/common/FwdLockGlue.c
ibdrmframework/plugins/forward-lock/internal-format/common/FwdLockGlue.h
ibdrmframework/plugins/forward-lock/internal-format/converter/Android.mk
ibdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.c
ibdrmframework/plugins/forward-lock/internal-format/converter/FwdLockConv.h
ibdrmframework/plugins/forward-lock/internal-format/decoder/Android.mk
ibdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.c
ibdrmframework/plugins/forward-lock/internal-format/decoder/FwdLockFile.h
ibdrmframework/plugins/forward-lock/internal-format/doc/FwdLock.html
ibdrmframework/plugins/forward-lock/internal-format/doc/images/image001.gif
ibdrmframework/plugins/forward-lock/internal-format/doc/images/image002.gif
ibdrmframework/plugins/forward-lock/internal-format/doc/images/image003.gif
ibdrmframework/plugins/forward-lock/internal-format/doc/images/image004.gif
ibdrmframework/plugins/forward-lock/internal-format/doc/images/image005.gif
ibdrmframework/plugins/forward-lock/internal-format/doc/images/image006.gif
|
| 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
rmserver/DrmManager.cpp
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
|
| e558276ea14c1a165aa3b319885e9512b8322613 |
25-Nov-2010 |
Gloria Wang <gwang@google.com> |
Remove empty Widevine make files
Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
ibdrmframework/plugins/widevine/Android.mk
|
| 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
ommon/DrmEngineBase.cpp
ommon/IDrmManagerService.cpp
ommon/ReadWriteUtils.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/DrmManagerService.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/plugins/common/include/DrmEngineBase.h
ibdrmframework/plugins/common/include/IDrmEngine.h
ibdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.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
ommon/Android.mk
ommon/DrmEngineBase.cpp
ommon/DrmMetadata.cpp
ommon/IDrmManagerService.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/DrmManagerService.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/plugins/common/include/DrmEngineBase.h
ibdrmframework/plugins/common/include/IDrmEngine.h
ibdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.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
ommon/IDrmManagerService.cpp
rmserver/DrmManager.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
ommon/DrmEngineBase.cpp
ommon/DrmInfoStatus.cpp
ommon/IDrmManagerService.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/DrmManagerService.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/plugins/common/include/DrmEngineBase.h
ibdrmframework/plugins/common/include/IDrmEngine.h
ibdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| 6dc55e7067d2baaf92970bd03412df98bf7f88c8 |
30-Oct-2010 |
Gloria Wang <gwang@google.com> |
Add support for WV plugin
Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
ibdrmframework/plugins/widevine/Android.mk
|
| d6d4ba97bcb39bf6d0cde32ce7bef1753e420548 |
26-Oct-2010 |
Gloria Wang <gwang@google.com> |
Do not create drm directory here. Fix for bug 3134576.
Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
rmserver/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
ommon/DrmConstraints.cpp
ommon/DrmEngineBase.cpp
ommon/DrmInfoEvent.cpp
ommon/DrmRights.cpp
ommon/DrmSupportInfo.cpp
ommon/IDrmIOService.cpp
ommon/IDrmManagerService.cpp
ommon/IDrmServiceListener.cpp
ommon/ReadWriteUtils.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
rmserver/StringTokenizer.cpp
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/DrmManagerService.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/include/ReadWriteUtils.h
ibdrmframework/plugins/common/include/DrmEngineBase.h
ibdrmframework/plugins/common/include/IDrmEngine.h
ibdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| 0335b70c6cdbe96650d4bed817f9233cd8db1c6d |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Make DRM libraries optional
Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
ommon/Android.mk
rmserver/Android.mk
ibdrmframework/Android.mk
ibdrmframework/plugins/passthru/Android.mk
|
| 3df6c0fc75b3278a93eff176471bd9c6365ab24b |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: Iccb40c8c5df879288f35e0940c721d306fb75c12
ibdrmframework/Android.mk
|
| ea916b1e27da465c5989a443040ca5e65e4592fe |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: Idccb3f2499bbaac61099d8232cadd633b93ad846
ibdrmframework/plugins/passthru/Android.mk
|
| a4f8842d67004f168b53fc684d4622679e19a3df |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: I4aba42eabb2f959b5301bfd16f65fa6141d86ddc
rmserver/Android.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
ommon/Android.mk
ommon/DrmConstraints.cpp
ommon/DrmConvertedStatus.cpp
ommon/DrmEngineBase.cpp
ommon/DrmInfo.cpp
ommon/DrmInfoEvent.cpp
ommon/DrmInfoRequest.cpp
ommon/DrmInfoStatus.cpp
ommon/DrmRights.cpp
ommon/DrmSupportInfo.cpp
ommon/IDrmIOService.cpp
ommon/IDrmManagerService.cpp
ommon/IDrmServiceListener.cpp
ommon/ReadWriteUtils.cpp
rmserver/Android.mk
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
rmserver/StringTokenizer.cpp
rmserver/main_drmserver.cpp
ibdrmframework/Android.mk
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmIOService.h
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/DrmManagerService.h
ibdrmframework/include/IDrmIOService.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/include/IDrmServiceListener.h
ibdrmframework/include/PlugInManager.h
ibdrmframework/include/ReadWriteUtils.h
ibdrmframework/include/StringTokenizer.h
ibdrmframework/plugins/Android.mk
ibdrmframework/plugins/common/include/DrmEngineBase.h
ibdrmframework/plugins/common/include/IDrmEngine.h
ibdrmframework/plugins/passthru/Android.mk
ibdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|