11 Commits

Author SHA1 Message Date
Steve Block
3762c31172 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
2012-01-08 13:19:13 +00:00
Steve Block
71f2cf116a 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
2011-10-26 09:57:54 +01:00
Gloria Wang
09337a07fa resolved conflicts for merge of 845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
2011-08-04 15:13:14 -07:00
Gloria Wang
845fdba7b5 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
2011-08-04 14:47:43 -07:00
Henrik B Andersson
93827fb09e 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
2011-08-04 13:43:02 +02:00
Gloria Wang
7bafb97d3f Fix a memory leak in the Forward Lock plugin.
For bug 4770217.

Change-Id: I14f4d4ead524c661e68a20738e7a50e4d8fd92ea
2011-06-21 11:07:59 -07:00
Gloria Wang
8b554f3503 To remove log spam in the Forward Lock DRM plugin.
Fix for bug 4619159.

Change-Id: Id4984aade4cceb59a1fdf904949f62535decd2a4
2011-06-14 14:50:10 -07:00
Gloria Wang
cbe0d94adf Duplicated fileDesc is not closed when input file is not forward-lock content.
Fix for bug 4606053.

Change-Id: I1b45457d8cdc75d268631911f46ce6ec931b1770
2011-06-13 16:29:38 -07:00
Iliyan Malchev
3070af0882 frameworks/base: remove LOCAL_PRELINK_MODULE
Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-14 14:25:59 -07:00
Gloria Wang
7a5321d4d8 rename /system/lib/drm/plugins/native/ to /system/lib/drm-plugin/
Change-Id: I043489cb81e53ed7cd5abd9769004da5ecd4d91d
2011-01-18 15:23:51 -08:00
Pravat Dalbehera
a3e96bfa89 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
2011-01-05 09:02:51 +01:00