• Home
  • History
  • Annotate
  • only in /frameworks/av/drm/libdrmframework/
History log of /frameworks/av/drm/libdrmframework/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
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
ndroid.mk
rmManagerClient.cpp
rmManagerClientImpl.cpp
oOpDrmManagerClientImpl.cpp
nclude/DrmManagerClientImpl.h
nclude/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
3ab368e0810d894dcbc0971350c095049478a055 15-Apr-2014 Mark Salyzyn <salyzyn@google.com> media: use size_t for integer iterator to Vector::size()

Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
nclude/PlugInManager.h
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
lugins/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
lugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
f355f18aa2cc1706761e373fe19298a9ccc9c75a 23-Jul-2013 Jeff Tinker <jtinker@google.com> Remove obsolete drm manager code

bug: 9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
rmManagerClientImpl.cpp
nclude/DrmManager.h
nclude/DrmManagerClientImpl.h
nclude/DrmManagerService.h
nclude/IDrmManagerService.h
da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6 10-Apr-2013 Ying Wang <wangying@google.com> Add liblog

Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
ndroid.mk
lugins/forward-lock/FwdLockEngine/Android.mk
lugins/passthru/Android.mk
558d60e4e2217e02b3e7adf7afaf51d1c6e08f91 15-Jul-2012 Henrik B Andersson <henrikb.andersson@sonymobile.com> Remove unnecessary lib dependencies in the FL makefile

Change-Id: Ia1e81a91b4b8dc1bf3558a4aa06e90a955c6fbe6
lugins/forward-lock/internal-format/converter/Android.mk
lugins/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
lugins/forward-lock/internal-format/converter/FwdLockConv.c
lugins/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
lugins/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
nclude/DrmManager.h
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
rmManagerClient.cpp
rmManagerClientImpl.cpp
nclude/DrmManager.h
nclude/DrmManagerClientImpl.h
nclude/DrmManagerService.h
nclude/IDrmManagerService.h
lugins/common/include/DrmEngineBase.h
lugins/common/include/IDrmEngine.h
lugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
lugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
lugins/forward-lock/internal-format/decoder/FwdLockFile.c
lugins/forward-lock/internal-format/decoder/FwdLockFile.h
lugins/passthru/include/DrmPassthruPlugIn.h
lugins/passthru/src/DrmPassthruPlugIn.cpp
9352d1168c09903d4ea27b695ef683316c544ae5 09-Aug-2012 James Dong <jdong@google.com> Remove some unused forward lock code

Change-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c
lugins/forward-lock/internal-format/converter/FwdLockConv.c
lugins/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
ODULE_LICENSE_APACHE2
OTICE
lugins/common/util/MODULE_LICENSE_APACHE2
lugins/common/util/NOTICE
lugins/forward-lock/FwdLockEngine/MODULE_LICENSE_APACHE2
lugins/forward-lock/FwdLockEngine/NOTICE
lugins/passthru/MODULE_LICENSE_APACHE2
lugins/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
rmManagerClient.cpp
rmManagerClientImpl.cpp
nclude/DrmManager.h
nclude/DrmManagerClientImpl.h
nclude/DrmManagerService.h
nclude/IDrmManagerService.h
lugins/common/include/DrmEngineBase.h
lugins/common/include/IDrmEngine.h
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
lugins/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
lugins/common/util/Android.mk
lugins/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
ndroid.mk
lugins/common/util/Android.mk
lugins/forward-lock/FwdLockEngine/Android.mk
lugins/forward-lock/internal-format/converter/Android.mk
lugins/forward-lock/internal-format/decoder/Android.mk
lugins/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
lugins/passthru/src/DrmPassthruPlugIn.cpp
0a38af09ebbacdc9aa0d5ecb24e2f0484bf4f191 14-Mar-2012 James Dong <jdong@google.com> Turned off log spamming from DrmPassthruPlugin

Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
lugins/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
lugins/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
lugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
lugins/forward-lock/FwdLockEngine/include/FwdLockEngineConst.h
lugins/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
lugins/forward-lock/internal-format/decoder/FwdLockFile.c
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
rmManagerClient.cpp
rmManagerClientImpl.cpp
nclude/DrmManager.h
nclude/DrmManagerClientImpl.h
nclude/DrmManagerService.h
nclude/IDrmManagerService.h
lugins/common/include/DrmEngineBase.h
lugins/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
lugins/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
rmManagerClientImpl.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
lugins/common/util/src/MimeTypeUtil.cpp
lugins/passthru/src/DrmPassthruPlugIn.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
lugins/forward-lock/FwdLockEngine/src/FwdLockEngine.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
lugins/common/util/include/SessionMap.h
lugins/common/util/src/MimeTypeUtil.cpp
lugins/forward-lock/FwdLockEngine/Android.mk
lugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
lugins/forward-lock/internal-format/converter/FwdLockConv.c
lugins/forward-lock/internal-format/decoder/FwdLockFile.c
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
rmManagerClient.cpp
rmManagerClientImpl.cpp
nclude/DrmManager.h
nclude/DrmManagerClientImpl.h
nclude/DrmManagerService.h
nclude/IDrmManagerService.h
lugins/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
ndroid.mk
lugins/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
rmManagerClientImpl.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
lugins/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
nclude/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
lugins/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
lugins/forward-lock/FwdLockEngine/src/FwdLockEngine.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
rmManagerClient.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
rmManagerClientImpl.cpp
nclude/DrmManagerClientImpl.h
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
rmManagerClientImpl.cpp
nclude/DrmManager.h
nclude/DrmManagerClientImpl.h
nclude/IDrmManagerService.h
lugins/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
nclude/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
nclude/PlugInManager.h
nclude/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>
ndroid.mk
lugins/forward-lock/FwdLockEngine/Android.mk
lugins/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
rmManagerClient.cpp
nclude/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
rmManagerClient.cpp
rmManagerClientImpl.cpp
nclude/DrmManagerClientImpl.h
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
lugins/widevine/Android.mk
lugins/widevine/include/WVMDrmPlugin.h
lugins/widevine/include/WVMLogging.h
lugins/widevine/src/WVMDrmPlugin.cpp
lugins/widevine/src/WVMLogging.cpp
lugins/widevine/test/Android.mk
lugins/widevine/test/TestPlugin.cpp
lugins/widevine/test/kill.sh
d4366e89e46317673a97516ee2d25768038dc444 15-Feb-2011 Gloria Wang <gwang@google.com> - Update from Widevine
- Bug fixes

Change-Id: I494cfe145e7aad36f3d8c68841cab847487dd85b
lugins/widevine/Android.mk
lugins/widevine/include/WVMDrmPlugin.h
lugins/widevine/include/WVMLogging.h
lugins/widevine/src/WVMDrmPlugin.cpp
lugins/widevine/src/WVMLogging.cpp
lugins/widevine/test/Android.mk
lugins/widevine/test/TestPlugin.cpp
lugins/widevine/test/kill.sh
44482001e106cfb7389110f869ddae381f8a2da7 21-Jan-2011 Glenn Kasten <gkasten@google.com> Bug 3361124 Remove drmioserver, continued

Change-Id: I525b7a3ac1a79d3aaa1d3c7853df1c903b38b7c0
nclude/DrmIOService.h
nclude/IDrmIOService.h
0a32d7981b98fdfca48a1e35ca746f1cc11849d3 19-Jan-2011 Gloria Wang <gwang@google.com> rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/

Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
lugins/forward-lock/FwdLockEngine/Android.mk
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"
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
lugins/common/Android.mk
lugins/common/util/Android.mk
lugins/common/util/include/MimeTypeUtil.h
lugins/common/util/include/SessionMap.h
lugins/common/util/src/MimeTypeUtil.cpp
lugins/forward-lock/Android.mk
lugins/forward-lock/FwdLockEngine/Android.mk
lugins/forward-lock/FwdLockEngine/include/FwdLockEngine.h
lugins/forward-lock/FwdLockEngine/include/FwdLockEngineConst.h
lugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
lugins/forward-lock/internal-format/Android.mk
lugins/forward-lock/internal-format/common/Android.mk
lugins/forward-lock/internal-format/common/FwdLockGlue.c
lugins/forward-lock/internal-format/common/FwdLockGlue.h
lugins/forward-lock/internal-format/converter/Android.mk
lugins/forward-lock/internal-format/converter/FwdLockConv.c
lugins/forward-lock/internal-format/converter/FwdLockConv.h
lugins/forward-lock/internal-format/decoder/Android.mk
lugins/forward-lock/internal-format/decoder/FwdLockFile.c
lugins/forward-lock/internal-format/decoder/FwdLockFile.h
lugins/forward-lock/internal-format/doc/FwdLock.html
lugins/forward-lock/internal-format/doc/images/image001.gif
lugins/forward-lock/internal-format/doc/images/image002.gif
lugins/forward-lock/internal-format/doc/images/image003.gif
lugins/forward-lock/internal-format/doc/images/image004.gif
lugins/forward-lock/internal-format/doc/images/image005.gif
lugins/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
rmManagerClient.cpp
rmManagerClientImpl.cpp
e558276ea14c1a165aa3b319885e9512b8322613 25-Nov-2010 Gloria Wang <gwang@google.com> Remove empty Widevine make files

Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
lugins/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
rmManagerClient.cpp
rmManagerClientImpl.cpp
nclude/DrmManager.h
nclude/DrmManagerClientImpl.h
nclude/DrmManagerService.h
nclude/IDrmManagerService.h
lugins/common/include/DrmEngineBase.h
lugins/common/include/IDrmEngine.h
lugins/passthru/include/DrmPassthruPlugIn.h
lugins/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
rmManagerClient.cpp
rmManagerClientImpl.cpp
nclude/DrmManager.h
nclude/DrmManagerClientImpl.h
nclude/DrmManagerService.h
nclude/IDrmManagerService.h
lugins/common/include/DrmEngineBase.h
lugins/common/include/IDrmEngine.h
lugins/passthru/include/DrmPassthruPlugIn.h
lugins/passthru/src/DrmPassthruPlugIn.cpp
b251f75d5ca3fa19cfe8a284717e00dec31f18ea 03-Nov-2010 Gloria Wang <gwang@google.com> resolved conflicts for merge of a8d7b747 to master

Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
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
rmManagerClient.cpp
rmManagerClientImpl.cpp
nclude/DrmManager.h
nclude/DrmManagerClientImpl.h
nclude/DrmManagerService.h
nclude/IDrmManagerService.h
lugins/common/include/DrmEngineBase.h
lugins/common/include/IDrmEngine.h
lugins/passthru/include/DrmPassthruPlugIn.h
lugins/passthru/src/DrmPassthruPlugIn.cpp
6dc55e7067d2baaf92970bd03412df98bf7f88c8 30-Oct-2010 Gloria Wang <gwang@google.com> Add support for WV plugin

Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
lugins/widevine/Android.mk
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
rmManagerClient.cpp
rmManagerClientImpl.cpp
nclude/DrmManager.h
nclude/DrmManagerClientImpl.h
nclude/DrmManagerService.h
nclude/IDrmManagerService.h
nclude/ReadWriteUtils.h
lugins/common/include/DrmEngineBase.h
lugins/common/include/IDrmEngine.h
lugins/passthru/include/DrmPassthruPlugIn.h
lugins/passthru/src/DrmPassthruPlugIn.cpp
0335b70c6cdbe96650d4bed817f9233cd8db1c6d 10-Sep-2010 Jean-Baptiste Queru <jbq@google.com> Make DRM libraries optional

Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
ndroid.mk
lugins/passthru/Android.mk
3df6c0fc75b3278a93eff176471bd9c6365ab24b 10-Sep-2010 Jean-Baptiste Queru <jbq@google.com> fix build

Change-Id: Iccb40c8c5df879288f35e0940c721d306fb75c12
ndroid.mk
ea916b1e27da465c5989a443040ca5e65e4592fe 10-Sep-2010 Jean-Baptiste Queru <jbq@google.com> fix build

Change-Id: Idccb3f2499bbaac61099d8232cadd633b93ad846
lugins/passthru/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
ndroid.mk
rmManagerClient.cpp
rmManagerClientImpl.cpp
nclude/DrmIOService.h
nclude/DrmManager.h
nclude/DrmManagerClientImpl.h
nclude/DrmManagerService.h
nclude/IDrmIOService.h
nclude/IDrmManagerService.h
nclude/IDrmServiceListener.h
nclude/PlugInManager.h
nclude/ReadWriteUtils.h
nclude/StringTokenizer.h
lugins/Android.mk
lugins/common/include/DrmEngineBase.h
lugins/common/include/IDrmEngine.h
lugins/passthru/Android.mk
lugins/passthru/include/DrmPassthruPlugIn.h
lugins/passthru/src/DrmPassthruPlugIn.cpp