| 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
wdLockEngine/Android.mk
|
| 817d4aa19e6a9c95ec20486e6d74dea5a38e7236 |
08-Nov-2013 |
Robert Shih <robertshih@google.com> |
Fixed file descriptor leak in FwdLockEngine::onGetOriginalMimeType.
Bug: 11534051
Change-Id: I0ab56b0a96b30f721bcac1d1ccc6ca85c3271ef5
wdLockEngine/src/FwdLockEngine.cpp
|
| ecba7488c5cceaacef95836b1b476433451e7761 |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
Add liblog
Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
wdLockEngine/Android.mk
|
| da0dc0af0effe9fbfb3ce3187c8472fca2baf3c6 |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
Add liblog
Bug: 8580410
Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
wdLockEngine/Android.mk
|
| 6baa0d222ad88749b3b22b488e6b3ee7d44b291d |
15-Jul-2012 |
Henrik B Andersson <henrikb.andersson@sonymobile.com> |
Remove unnecessary lib dependencies in the FL makefile
Change-Id: Ia1e81a91b4b8dc1bf3558a4aa06e90a955c6fbe6
nternal-format/converter/Android.mk
nternal-format/decoder/Android.mk
|
| 558d60e4e2217e02b3e7adf7afaf51d1c6e08f91 |
15-Jul-2012 |
Henrik B Andersson <henrikb.andersson@sonymobile.com> |
Remove unnecessary lib dependencies in the FL makefile
Change-Id: Ia1e81a91b4b8dc1bf3558a4aa06e90a955c6fbe6
nternal-format/converter/Android.mk
nternal-format/decoder/Android.mk
|
| 61eae44c393f47103e9cc58b3deb92ece49fcb51 |
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
nternal-format/converter/FwdLockConv.c
nternal-format/decoder/FwdLockFile.c
|
| 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
nternal-format/converter/FwdLockConv.c
nternal-format/decoder/FwdLockFile.c
|
| 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
wdLockEngine/include/FwdLockEngine.h
wdLockEngine/src/FwdLockEngine.cpp
nternal-format/decoder/FwdLockFile.c
nternal-format/decoder/FwdLockFile.h
|
| 9352d1168c09903d4ea27b695ef683316c544ae5 |
09-Aug-2012 |
James Dong <jdong@google.com> |
Remove some unused forward lock code
Change-Id: I94d01f6ad5b1676cc4d6a95807e166f3c25aa79c
nternal-format/converter/FwdLockConv.c
nternal-format/converter/FwdLockConv.h
|
| 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
wdLockEngine/MODULE_LICENSE_APACHE2
wdLockEngine/NOTICE
|
| cec40f97a8c0b9a43a78ae98fc35fcc80d6f6c4f |
29-Mar-2012 |
James Dong <jdong@google.com> |
Removed unnecessary include JNI from two drm Android.mk files
Change-Id: I7b7a1acce4d6db748ff193270e73bc3582ba2380
wdLockEngine/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
wdLockEngine/Android.mk
nternal-format/converter/Android.mk
nternal-format/decoder/Android.mk
|
| 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
wdLockEngine/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
wdLockEngine/include/FwdLockEngine.h
wdLockEngine/include/FwdLockEngineConst.h
wdLockEngine/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
nternal-format/decoder/FwdLockFile.c
|
| 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
wdLockEngine/src/FwdLockEngine.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
wdLockEngine/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
wdLockEngine/Android.mk
wdLockEngine/src/FwdLockEngine.cpp
nternal-format/converter/FwdLockConv.c
nternal-format/decoder/FwdLockFile.c
|
| 409e5a07f044239aac2059c9ba3b3f6f48eeaba1 |
21-Jun-2011 |
Gloria Wang <gwang@google.com> |
Fix a memory leak in the Forward Lock plugin.
For bug 4770217.
Change-Id: I14f4d4ead524c661e68a20738e7a50e4d8fd92ea
wdLockEngine/src/FwdLockEngine.cpp
|
| 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
wdLockEngine/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
wdLockEngine/src/FwdLockEngine.cpp
|
| 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>
wdLockEngine/Android.mk
|
| 0a32d7981b98fdfca48a1e35ca746f1cc11849d3 |
19-Jan-2011 |
Gloria Wang <gwang@google.com> |
rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/
Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
wdLockEngine/Android.mk
|
| 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
ndroid.mk
wdLockEngine/Android.mk
wdLockEngine/include/FwdLockEngine.h
wdLockEngine/include/FwdLockEngineConst.h
wdLockEngine/src/FwdLockEngine.cpp
nternal-format/Android.mk
nternal-format/common/Android.mk
nternal-format/common/FwdLockGlue.c
nternal-format/common/FwdLockGlue.h
nternal-format/converter/Android.mk
nternal-format/converter/FwdLockConv.c
nternal-format/converter/FwdLockConv.h
nternal-format/decoder/Android.mk
nternal-format/decoder/FwdLockFile.c
nternal-format/decoder/FwdLockFile.h
nternal-format/doc/FwdLock.html
nternal-format/doc/images/image001.gif
nternal-format/doc/images/image002.gif
nternal-format/doc/images/image003.gif
nternal-format/doc/images/image004.gif
nternal-format/doc/images/image005.gif
nternal-format/doc/images/image006.gif
|