| 3cfe720a0d250f7aac88fdd303bf34005ebb9ab7 |
10-Jun-2014 |
Adam Lesinski <adamlesinski@google.com> |
am 5fed49f7: am 4d9fcae2: Merge "Allow for a NoOp implementation of DrmManagerClientImpl" into klp-modular-dev
* commit '5fed49f7d614ae9e83db04703484b31c8077b78c':
Allow for a NoOp implementation of DrmManagerClientImpl
|
| 510ef1b537fece28b9f9e561f5c922d7aca8d294 |
05-Jun-2014 |
Adam Lesinski <adamlesinski@google.com> |
Allow for a NoOp implementation of DrmManagerClientImpl
Change-Id: I150b95790d5e6d3c0160637149f18f2194318de8
ni/android_drm_DrmManagerClient.cpp
|
| c1858228df18528aabe1ff223335f613be2b99d8 |
29-Apr-2014 |
Elliott Hughes <enh@google.com> |
Fix a few more stray libcore.io references.
Change-Id: Id328544bd3a382fec16507d0ae5b699fef44ebd7
ava/android/drm/DrmOutputStream.java
|
| f97c63350abcc6715ba9fdc21fd3405d0f7ba716 |
29-Apr-2014 |
Elliott Hughes <enh@google.com> |
Move internal libcore.os users over to android.system.
Change-Id: I84e1ace19ba3b4e58d7bb24f3ecda1bdf5dc75a5
ava/android/drm/DrmOutputStream.java
|
| ebf8ad5d91b22eb4359c75711a5b70ddcce0723d |
31-Jan-2014 |
Jeff Sharkey <jsharkey@android.com> |
Update DrmOutputStream to use raw FileDescriptor.
This allows DownloadManager to use FDs, paving the way for downloading
directly to content:// Uris.
Also return flag indicating if deleteOlderFiles() actually deleted
anything. Update tests to verify.
Bug: 5287571
Change-Id: I2579e5e2113f31b2860d7b021bd61c91b6310963
ava/android/drm/DrmOutputStream.java
|
| 38885b63fc41e664681b6fd12159c7ce04e3addc |
29-Jan-2014 |
Narayan Kamath <narayan@google.com> |
am 38638b2f: am eaae9906: am 672f3ee3: am 95ba1eb6: am dd6de16a: Merge "AArch64: Use long for pointers in DRM classes"
* commit '38638b2fcc4aba428889d521d83762d716e32332':
AArch64: Use long for pointers in DRM classes
|
| 33d603877acf76d5d59484532025af20f4b068a5 |
17-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in DRM classes
For storing pointers, long is used in DRM classes,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: I101b0ea19ed93651c6ad1a9fa55e14e8be117469
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
ava/android/drm/DrmManagerClient.java
ni/android_drm_DrmManagerClient.cpp
|
| 6090995951c6e2e4dcf38102f01793f8a94166e1 |
19-Nov-2013 |
John Spurlock <jspurlock@google.com> |
Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
ava/android/drm/DrmUtils.java
|
| 490dd056bd2fdfc630cd43b3fc1c90baf509bffe |
31-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Revert "Enhancement for OnInfo callback on DRM Framework"
This reverts commit 6fd97b7d93c5eeaefb2695786b35d1672c88b0cf.
Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video
bug: 10542864
Change-Id: I85b84d6b602079571be1a7237c907716db9cdf54
ava/android/drm/DrmManagerClient.java
ni/android_drm_DrmManagerClient.cpp
|
| 6fd97b7d93c5eeaefb2695786b35d1672c88b0cf |
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: I5f2bfb43b676863ef4d220fd4ef1e48777e92752
(cherry picked from commit 84a5b5cab40711e20ba70c5ed4dfeab6b558b53b)
ava/android/drm/DrmManagerClient.java
ni/android_drm_DrmManagerClient.cpp
|
| d685894212e6dbeac1fda4996903c1da115d49a6 |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
Add liblog
Bug: 8580410
Change-Id: I746aa8258866508c3a725d0773faf4518096548f
ni/Android.mk
|
| 7ccc90955fad0701b6b14c813a2850ee4149c5a2 |
18-Dec-2012 |
Jeff Sharkey <jsharkey@android.com> |
Move stream creation outside of DrmOutputStream.
More closely matches the object ownership pattern used by other
stream APIs. Callers must now explicitly finish(). Also fixes
write(int) bug by switching to Streams API.
Change-Id: I64f9c5887ef02496b1ce4e97ce6af5dad93b4be2
ava/android/drm/DrmOutputStream.java
|
| f67c8a9685e0f20d5ffb9de95f6d1ce47f052141 |
13-Dec-2012 |
Jeff Sharkey <jsharkey@android.com> |
Move DRM to CloseGuard, add DrmOutputStream.
Switch DrmManagerClient to using CloseGuard to better track leaked
resources. Add DrmOutputStream which applies DRM transformation as
data is written, similar to FilterOutputStream. Also writes DRM
headers before closing.
Change-Id: Ic106a3e6f6ff666e4dda484fbd234a0849eec8c0
ava/android/drm/DrmManagerClient.java
ava/android/drm/DrmOutputStream.java
|
| 58ed5d748c0b9b64845975ef5844ad313de7c3f6 |
07-Nov-2012 |
Kenny Root <kroot@google.com> |
am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
Correct executable bit for source files
|
| 3a084af2e90849aaa8beb3a610189e3399c63ea0 |
07-Nov-2012 |
Kenny Root <kroot@google.com> |
Correct executable bit for source files
Many media files and source code files were marked as executable in Git.
Remove those.
Also a shell script and python script were not marked as executable.
Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
ava/android/drm/DrmConvertedStatus.java
ava/android/drm/DrmErrorEvent.java
ava/android/drm/DrmEvent.java
ava/android/drm/DrmInfo.java
ava/android/drm/DrmInfoEvent.java
ava/android/drm/DrmInfoRequest.java
ava/android/drm/DrmInfoStatus.java
ava/android/drm/DrmManagerClient.java
ava/android/drm/DrmRights.java
ava/android/drm/DrmStore.java
ava/android/drm/DrmSupportInfo.java
ava/android/drm/DrmUtils.java
ava/android/drm/ProcessedData.java
ava/android/drm/package.html
|
| d78fc5b94d1bb3dab509ca55d09052821c51412b |
22-Aug-2012 |
James Dong <jdong@google.com> |
Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev
|
| 0889fdae87abd9ec78a6c1d00c2771acfa4e4d34 |
09-Aug-2012 |
James Dong <jdong@google.com> |
Let getOriginalMimeType() take a fd passed from drm java applications
At present, we did not actually pass the fd. This patch allows us to
make the changes necessary in the future without worrying too much
about broken build.
related-to-bug: 6426185
Change-Id: I125decff9be621a72f2631fd439994a94a526606
ava/android/drm/DrmManagerClient.java
ni/android_drm_DrmManagerClient.cpp
|
| 057b086e0e054247840060cbd1e14295a214221b |
10-Feb-2012 |
Henrik B Andersson <henrikb.andersson@sonymobile.com> |
Release JNI local references as soon as possible.
The JNI layer has a fix amount (512) of jni references.
They should be released as soon as possible. In for
and while loops they can quickly reach the limit.
Change-Id: Id984345e1cc4f7aa6eb31a263b796c3da9edf773
ni/Android.mk
ni/android_drm_DrmManagerClient.cpp
|
| 011385508726fef027641fcbb3e4e446efc9af2c |
07-May-2012 |
James Dong <jdong@google.com> |
Fix an issue where the message queue fails to queue in the looper threads because they are not created.
o related-to-bug: 6293875
Change-Id: I03dbb2782bd90f88d1f8df086b8a529730afe5dc
ava/android/drm/DrmManagerClient.java
|
| ba4d0433319393d626d2169683209e4956a087e2 |
28-Mar-2012 |
James Dong <jdong@google.com> |
frameworks base Android.mk file changes
Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
ni/Android.mk
|
| d927a1d99630c05ff773f0e9e8791ca9a965e020 |
28-Mar-2012 |
James Dong <jdong@google.com> |
Deleted the media, camera, drm related files since they are relocated
Change-Id: I9bc5573ee07e30b305b5b879023aa9ec69e10b91
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/DrmMetadata.cpp
ommon/DrmRights.cpp
ommon/DrmSupportInfo.cpp
ommon/IDrmManagerService.cpp
ommon/IDrmServiceListener.cpp
ommon/ReadWriteUtils.cpp
rmserver/Android.mk
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
rmserver/main_drmserver.cpp
ibdrmframework/Android.mk
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/DrmManagerService.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/include/IDrmServiceListener.h
ibdrmframework/include/PlugInManager.h
ibdrmframework/include/ReadWriteUtils.h
ibdrmframework/plugins/Android.mk
ibdrmframework/plugins/common/Android.mk
ibdrmframework/plugins/common/include/DrmEngineBase.h
ibdrmframework/plugins/common/include/IDrmEngine.h
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/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
ibdrmframework/plugins/passthru/Android.mk
ibdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| 89ea4ca9c26f3c7e365525a0b83500e85517a457 |
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"
|
| 8e3fac28a0326c060c01f5cdcfaf36cc995f3d19 |
14-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Fixed a buffer overflow bug in DrmPassthruPlugin"
|
| 32d8fc8d6d77eef02077142feb8bd9c7ee2cbe8f |
14-Mar-2012 |
James Dong <jdong@google.com> |
Fixed a buffer overflow bug in DrmPassthruPlugin
Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| c3259471c6c423577323f5260b4b0e2ea882f7cb |
14-Mar-2012 |
James Dong <jdong@google.com> |
Turned off log spamming from DrmPassthruPlugin
Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| 29cdbc80bb55052ca6c291068d9358aee71cc46c |
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
|
| 1a22cbd113512f03d7db40e4be25a02047cb6c88 |
12-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Avoid checking supported mime types or file suffixes in multiple places"
|
| 4f1ed0e84ea7ce820ef6006189017933fc96a71c |
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
|
| 862339039a62e5abd97df353168adb46aad746d5 |
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
|
| 9864b25bd8ac2c68f290817ac5fe73077e130b45 |
03-Mar-2012 |
James Dong <jdong@google.com> |
There was copy and paste code in JNI to create a DrmConvertedStatus object.
o This patch removed duplicated code.
Change-Id: Ic3d3461fb8da6fab1b4d19d28b8d9d4abc8a53b1
ni/android_drm_DrmManagerClient.cpp
|
| f16a2724e08d59c09c95d0fc0db09cfbe67f6141 |
03-Mar-2012 |
James Dong <jdong@google.com> |
Fix some JNI issues in the drm framework
o allocated array using new must be deleted using delete[]
o removed duplicated code
Change-Id: Ifa8e2e1cd46568c5266717eb1ad340b61a843adc
ni/android_drm_DrmManagerClient.cpp
|
| e43dadffb8ac8756216a7696dbff987a6d5d8569 |
02-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes"
|
| 7edb9a94908f41b9dc3aa13d2089efa304f12c22 |
02-Mar-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources"
* commit 'f73222a39e0fa294d9105fd7464943aed6e77cd7':
DRM framwork bug fix: add an API to release resources
|
| 52cb1e5988a8a97c668b935fb5d8d358cb3c635a |
29-Feb-2012 |
James Dong <jdong@google.com> |
Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes
o added missing javadoc comment for some public fields
o added checks for arguments
o DrmSupportInfo should have not been exposed as public.
A default package access modifier appears to be more proper but we may
not be able to change the modifier.
Change-Id: I5b284c17219c5121f241ee2934fb3e859ce7c827
ava/android/drm/DrmConvertedStatus.java
ava/android/drm/DrmInfoStatus.java
ava/android/drm/DrmSupportInfo.java
|
| 6225df010365d00b1d0f3b1ca13f18cea537c8e3 |
31-Jan-2012 |
Kei Takahashi <KeiA.Takahashi@jp.sony.com> |
DRM framwork bug fix: add an API to release resources
When DrmManagerClient object is created and released many times,
the process suddenly crashes.
The case can happen when we make many thumbnails of
DRM-encrypted contents.
The problem is caused by shortage of file descriptors.
DrmManagerClient releases references of file descriptors
only when GC runs. So file descriptors are kept long time
even after the reference of DrmManagerClient are released.
By introducing DrmManagerClient#release() API,
the problem is solved. An application call this API
when we no longer need to use DrmManagerClient object.
Changes are made by SEMC and Sony.
Change-Id: Ie0bbc29cc33872449824285a8d67b1c3cdd8082b
ava/android/drm/DrmManagerClient.java
ni/android_drm_DrmManagerClient.cpp
|
| 5df628055789a14267be365beffc0626b7822e96 |
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
|
| 2f16d7eae1b2dfd87be5fc55be3bec012ab7389d |
28-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Fix API issues in DrmRights class."
|
| e512ad5089eef76d080fc6fdd17dfb88ad8b72e9 |
28-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Deprecate default constructor for classes that should have been meant to be interfaces"
|
| 31db8b9f6ba2dfb5c3c9cb0f25ed4b71872fc98c |
28-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Remove unnecessary header file includes for drmserver"
|
| da5ac93b005b5523a7f18594f52ee169d83e08d4 |
28-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Added missing javadoc comment for public API in DrmUtils class"
|
| f7a68fc98550859019bb0636fc3e8d88cb50e6a6 |
28-Feb-2012 |
James Dong <jdong@google.com> |
Added missing javadoc comment for public API in DrmUtils class
o also fixed mis-spelled private method name (quiteDispose => quietlyDispose)
Change-Id: I692cd7471eac547b849dd53853f60843b3915750
ava/android/drm/DrmUtils.java
|
| a3a9d6e746cc1140cad9ab657860e00fb3940748 |
28-Feb-2012 |
James Dong <jdong@google.com> |
Remove unnecessary header file includes for drmserver
Change-Id: I14033861e74d20f9d4897b651c4eeee126d4d610
rmserver/main_drmserver.cpp
|
| 5cb68c86ccb34d42bd4fb59128043037f74763a3 |
28-Feb-2012 |
James Dong <jdong@google.com> |
Fix API issues in DrmRights class.
o account id and subscription id are not mandatory, and thus can be anything
such as null or an empty string.
o removed unnecessary or thus inconsistent checks for account id and subscription id
o updated the javadoc to specify that mimeType could not be null or an empty string.
Change-Id: I704f1dd7fc5d33060da908aae0469d560c7db036
ava/android/drm/DrmRights.java
|
| c4a9976aa15929a73ab7c0979d8b2e1e9eeadcc7 |
28-Feb-2012 |
James Dong <jdong@google.com> |
Deprecated a mis-spelled method and replaced it with a new method
Change-Id: Id049a4effab120c3f837cde60a87efcd89a64ec6
ava/android/drm/DrmSupportInfo.java
|
| 060526f9856e52964eaf13df8db74f5fbdcb83b1 |
28-Feb-2012 |
James Dong <jdong@google.com> |
Deprecate default constructor for classes that should have been meant to be interfaces
o We should have not exposed these default constructors in the first place.
Change-Id: Ia8bcfe77e9730021ad8870ece67c6d0eed8146ad
ava/android/drm/DrmStore.java
|
| b7956de3a9eba521fd681cece0370d0b5960ed1e |
25-Feb-2012 |
James Dong <jdong@google.com> |
Merge "Improved comment about DrmStore.ConstraintsColumns"
|
| e82f055e3eb1b0b3daf87bc14258fa65568b4f8a |
24-Feb-2012 |
James Dong <jdong@google.com> |
Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent
o This patch will prevent applications from abusing the API by using
arbitrary int value for DrmErrorEvent or DrmInfoEvent types.
o We should have not defined some type constants in the super/base
class, DrmEvent.
Change-Id: Id0bb12caa8ce471cb6951cc2b5d37ea408f90063
ava/android/drm/DrmErrorEvent.java
ava/android/drm/DrmEvent.java
ava/android/drm/DrmInfoEvent.java
|
| 365ce1db339db53cd5afb118ff867fe940644e45 |
23-Feb-2012 |
James Dong <jdong@google.com> |
Improved comment about DrmStore.ConstraintsColumns
Change-Id: I89c588759dd409ac0252d686af12bfe4e105f3d5
ava/android/drm/DrmManagerClient.java
ava/android/drm/DrmStore.java
|
| 6c95d4ff1656007ab5cbf0a6406d80a33bf8b109 |
15-Feb-2012 |
James Dong <jdong@google.com> |
Added checks for illegal arguments
Change-Id: Ib386c33b7e2cab12cabbb9dc023d54df05472960
ava/android/drm/DrmInfo.java
ava/android/drm/DrmInfoRequest.java
ava/android/drm/DrmInfoStatus.java
ava/android/drm/DrmRights.java
|
| c6aacce37191e1cc79cfeba13b39899f59c68c3b |
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
ommon/ReadWriteUtils.cpp
ni/android_drm_DrmManagerClient.cpp
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| a51f0e707f1f3142358aa919ea60ad2842803139 |
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
ibdrmframework/DrmManagerClientImpl.cpp
|
| 933e85615059b85a87747da57288384541cc56da |
04-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
rmserver/main_drmserver.cpp
|
| 1afd5bab4e0eaba8b5bc2ab5c7b556cd602cf2e7 |
20-Dec-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
ibdrmframework/plugins/common/util/src/MimeTypeUtil.cpp
ibdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp
|
| 06ade6ae1bd015e8b8ad0685847911213c93cc5b |
20-Oct-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
ommon/DrmMetadata.cpp
ommon/IDrmManagerService.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
ni/android_drm_DrmManagerClient.cpp
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| d1ba6ed94543b6d2af666e01f4ffd29412511400 |
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
|
| 3762c311729fe9f3af085c14c5c1fb471d994c03 |
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
ni/android_drm_DrmManagerClient.cpp
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| 8564c8da817a845353d213acd8636b76f567b234 |
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
|
| 5baa3a62a97544669fba6d65a11c07f252e654dd |
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
|
| 29e97f169d87490e4755e8b7608e6324367e752f |
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.
|
| d70c64db9f67dbe8f888de6b1bdcc835226ec526 |
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
|
| b34027bb2fc3394d054986d7bbbcf54261436c11 |
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
|
| a5cbf023e349f2394ba6fc58d73b4375cfec4369 |
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
|
| 91225183d6e07a3fa0b5ce59451bce1106be80fd |
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
|
| 71f2cf116aab893e224056c38ab146bd1538dd3e |
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
ni/android_drm_DrmManagerClient.cpp
ibdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
|
| aab6fe21df535171006063edf8367b59c6e525e0 |
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
|
| 09337a07fa6b0d065f7292ea21c02097d3478717 |
05-Aug-2011 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of 845fdba7 to master
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
|
| 845fdba7b5a7b89571f2c85bd542c75650054544 |
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
|
| 93827fb09eec4d6f594c5643288cf376488a5089 |
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
|
| 601a90c38a61fccb614ee1da9f3a388a7a1c2302 |
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
|
| a17d454fd0d20d14cf1fbc09f0f296cb6cbb870b |
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
ava/android/drm/DrmManagerClient.java
ni/android_drm_DrmManagerClient.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
|
| bd882b1c8708686d373c56e07e6bb8b1cb6ffd9e |
12-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
rmserver/Android.mk
ni/Android.mk
ibdrmframework/Android.mk
ibdrmframework/plugins/passthru/Android.mk
|
| b7e7bdfe784959ac8615851c2741eb9518a5afcf |
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
ava/android/drm/DrmRights.java
ibdrmframework/DrmManagerClientImpl.cpp
|
| 93aa58fd944b5cfb825f592de29e25a4f02cf97a |
21-Jun-2011 |
Gloria Wang <gwang@google.com> |
Merge "Fix a memory leak in the Forward Lock plugin. For bug 4770217."
|
| 7bafb97d3facf974fa4cf26bf182bf7d5f039439 |
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
|
| 464c1202669c8a9582dd4e0cede5ccf419d2a73e |
16-Jun-2011 |
Gloria Wang <gwang@google.com> |
Merge "-Fix some typo -Remove one unnecessary memory allocation"
|
| 2980a213752d6e30edd4c689489cb4a2c3006252 |
15-Jun-2011 |
Gloria Wang <gwang@google.com> |
-Fix some typo
-Remove one unnecessary memory allocation
Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
ommon/IDrmManagerService.cpp
ava/android/drm/DrmInfoRequest.java
ava/android/drm/DrmInfoStatus.java
ibdrmframework/include/PlugInManager.h
|
| 8b554f3503e3b2463303c88a0b57dc171b77ae78 |
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
|
| cbe0d94adf1f25a31689026d2fbbc9e9eb4e84eb |
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
|
| 3f0341cbbdeee248e71814f7071233c823b44f74 |
24-Apr-2011 |
James Dong <jdong@google.com> |
Fix memory leak from retrieval of getSupportedDrmInfo.
Change-Id: Ic2192a9791c0a3c5e5357b4367a2d8bfb15af20c
rmserver/DrmManager.cpp
|
| 503b111b2421673796500627a1f6d74d81bf9548 |
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.
|
| 4c87a75073987e30b36f6be781cd10f696876ba4 |
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
|
| 9e1e9a339e716b635c5eeded299478774030b608 |
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
|
| f46821b9d932ba0f1d0dfd88e98f319e0d3b789b |
24-Mar-2011 |
Bill Gruber <billg@google.com> |
am 640f63c2: am 3bde4594: am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
* commit '640f63c2669fc9dc38b349066d4d28111655dc3f':
DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
|
| 0357ec78b82ae104e56c26941d42fa7ef875462b |
23-Mar-2011 |
Bill Gruber <billg@google.com> |
Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1
|
| 0e092f806b0a4b81785a52da8ba22d2d47087de5 |
18-Mar-2011 |
Bill Gruber <billg@google.com> |
DRM API doc scrub
This change contains information contributed by Sony Corporation.
Bug: 4119363
Change-Id: I6f565c15d512d675993dc65f7fee19bd3d0bc0fa
ava/android/drm/DrmConvertedStatus.java
ava/android/drm/DrmErrorEvent.java
ava/android/drm/DrmEvent.java
ava/android/drm/DrmInfo.java
ava/android/drm/DrmInfoEvent.java
ava/android/drm/DrmInfoRequest.java
ava/android/drm/DrmInfoStatus.java
ava/android/drm/DrmManagerClient.java
ava/android/drm/DrmRights.java
ava/android/drm/DrmStore.java
ava/android/drm/DrmSupportInfo.java
ava/android/drm/DrmUtils.java
ava/android/drm/ProcessedData.java
ava/android/drm/package.html
|
| 5c62d9961d89f6ce6641671fe11501eff5afa43f |
23-Mar-2011 |
Carl Shapiro <cshapiro@google.com> |
Merge "Include strings.h for the strcasecmp prototype."
|
| 39ad826d2ef799163c8865d59a453ce54175c291 |
22-Mar-2011 |
Carl Shapiro <cshapiro@google.com> |
Include strings.h for the strcasecmp prototype.
Change-Id: I83cd464d59d16f1c5f8afa7e50d474ca2bb41713
ommon/DrmSupportInfo.cpp
|
| 66044c17924f56ee838e1b4262e1f64f7723aac2 |
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
|
| c430394ed7dcb458b0850bb1ce28abeb49252d77 |
22-Mar-2011 |
Gloria Wang <gwang@google.com> |
Add one more field in DecryptHandle to support bug 4126624
Change-Id: Ic7ea5fd211c4f8283de8fdf722f89b6a94e5750b
ommon/IDrmManagerService.cpp
|
| ee4084bf063249b3506cdc0a454dd19fa8f7549f |
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
|
| 3bbeaacfc0348a951c4bac56f2311fa9c3fe4f38 |
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
|
| cfbe4369b3cd493af3943aae7e0b1590f8e5f20d |
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
|
| 454b2d1c34238ba33d8f6861971a74c80c3e302a |
17-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1
* commit '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707':
Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
|
| f8bf3c46f524b1252bf466a351daaef61afdcecb |
16-Mar-2011 |
Gloria Wang <gwang@google.com> |
Fix for 4089881.
- Add one more parameter in the interface of DrmEvent and its subclasses
DrmInfoEvent and DrmErrorEvent
- Send back DrmInfo in the response of async processDrmInfo calls
Change-Id: Ia9b1a641296629a19ae4ffa7913e6c878fd340f8
ava/android/drm/DrmErrorEvent.java
ava/android/drm/DrmEvent.java
ava/android/drm/DrmInfoEvent.java
ava/android/drm/DrmManagerClient.java
|
| 0e5e2e2b2bb3d6c3a0216181df29e6bfdc71256f |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "Bug fixes of DRM framework."
|
| e5eb43b5d9dfd02890dc7f729a4892b518c30570 |
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
|
| 4528a7db389b4da73207d00ca15b306a111650cc |
15-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1
|
| 5c96c65f692f8c2297d213c88450dd601d2b5c1f |
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
ava/android/drm/DrmInfoRequest.java
ibdrmframework/DrmManagerClientImpl.cpp
ibdrmframework/include/DrmManager.h
ibdrmframework/include/DrmManagerClientImpl.h
ibdrmframework/include/IDrmManagerService.h
ibdrmframework/plugins/common/include/IDrmEngine.h
|
| ed73246b32a725d00b0b7d7e171e5817d9f27a80 |
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
|
| f8a1842e07d5c018b33762a72a1b1b5117947579 |
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
|
| 5c4421f73fe9ce7d9587add4dfa6fdac3b19ca4e |
15-Mar-2011 |
Gloria Wang <gwang@google.com> |
am 67718e07: am 132bb659: Merge "For issue 4082089 Add more info and error events into the DRM framework" into honeycomb-mr1
* commit '67718e076422f8f28f4e30a39df9e462ef32d19b':
For issue 4082089 Add more info and error events into the DRM framework
|
| 27b277779c89251f2aafcc7a56db95d264900c9d |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
For issue 4082089
Add more info and error events into the DRM framework
Change-Id: I0bb3251c5947fc8e977d478e1ba46b242cb97e9d
ava/android/drm/DrmErrorEvent.java
ava/android/drm/DrmInfoEvent.java
ava/android/drm/DrmManagerClient.java
|
| 3070af08821ee86f06a9cc6b58dbb79c82946b94 |
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>
ni/Android.mk
ibdrmframework/Android.mk
ibdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
ibdrmframework/plugins/passthru/Android.mk
|
| 09ba5cebb2cbfbc1f5705b22796ebdf895d91db4 |
14-Mar-2011 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of c761a80d to master
Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
|
| 192b591cdca78f258dd3260e41d7217f6fc6e36c |
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
|
| ae7752798a98fc81ff5e6ae69dde2137692106be |
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
|
| 54fe58562bb8df5155d4cdf3eb22d950be9dd273 |
10-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "- 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" into honeycomb-mr1
|
| 2ef2d49aa3c19e99e2a753dac2dfb51fc87b5328 |
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
|
| b8b6a9a8d405d2a3f1d593ebaf7f07574dd586b9 |
07-Mar-2011 |
Gloria Wang <gwang@google.com> |
To support uri started with http:// in some Java APIs
Fix for bug 4016388.
Change-Id: I9f6f449dca49eb03446bf6aa22b5dd467ca189c9
ava/android/drm/DrmManagerClient.java
|
| 6c1bebe33e42e584951314116b7b370ebc32aa64 |
03-Mar-2011 |
Gloria Wang <gwang@google.com> |
Merge "Do not call processDrmInfo if acquireDrmInfo returns null"
|
| 4ef690a38b1dfdff3ae34e260435edcec37e520f |
03-Mar-2011 |
Gloria Wang <gwang@google.com> |
Do not call processDrmInfo if acquireDrmInfo returns null
Change-Id: Ib762d429daaa8cb2310951cc54f26d75aacaf673
ava/android/drm/DrmManagerClient.java
|
| 289401b7566384570de86e9ad6ab3c572e358675 |
02-Mar-2011 |
Gloria Wang <gwang@google.com> |
To support DRM files without file extension
Change-Id: Ie7701048d0dbd51bf358364014a1b41c894b664c
ommon/DrmSupportInfo.cpp
rmserver/DrmManager.cpp
|
| e8c89a319944fd61d427816b26c26994c4b77ea7 |
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
|
| 6681984cf6aaae5f26cf6b82c7bb9f1c50d7ecd7 |
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
|
| 33fdd1c1d5a200f86d3e400a234e8a4452bd94db |
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
|
| e9b467d7dd26d508b29fbecd555cb562c0a8b472 |
20-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3361124 Remove drmioserver
Change-Id: I64cba4be8a38b60bf3873836b4cd0d1039e19706
rmioserver/Android.mk
rmioserver/DrmIOService.cpp
rmioserver/main_drmioserver.cpp
|
| 3bf37ac4a03cc6f1fee4ef9bfb420a2c283dfd7a |
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.
|
| 113529f062c43b111efbbd1382e23befdd1cdd30 |
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.
|
| d0423d2b129502fe9cb2d3efd7d9db2db847af89 |
20-Jan-2011 |
Gloria Wang <gwang@google.com> |
More fix for 64 bit offset.
Change-Id: Ia05060113ca0f43a4362914dc99c89c89e30eb4a
ommon/IDrmManagerService.cpp
|
| 7a5321d4d8f268e88b1ebfe75880ffeac235a8b6 |
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
|
| c89d31932135dfc7786ede20cb4713f6f55e3f1a |
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
|
| c35b3268919e6201f269eb9011ae184c5f613bc3 |
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
|
| a220a2979937700024662be0f8fc166ca65506ed |
13-Jan-2011 |
Gloria Wang <gwang@google.com> |
Merge "Initial OMA DRM forward lock contribution"
|
| 70e8d9cb554702802a6bcf7ef5e466bbd0fc30f1 |
12-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 3229711"
|
| cbba720a460f49a9d16afcc7e85c4564d7d945a1 |
12-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3229711
Change-Id: I3a4d41597cb92a1526417a622390dbb93dc71e99
rmserver/DrmManager.cpp
|
| 3b7983cfea8885e394e7d625a31cbd0ae71e8edb |
11-Jan-2011 |
Gloria Wang <gwang@google.com> |
am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."
* commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d':
DRM Framework bug fixes.
|
| a3e96bfa89964cbc431080e1b9f4ad8981b5426b |
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
|
| f05913aaa0cc96eab32be3431de1a80d405527a1 |
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
ava/android/drm/DrmManagerClient.java
ibdrmframework/DrmManagerClient.cpp
ibdrmframework/DrmManagerClientImpl.cpp
|
| c584428795e26c49c4c00edf0d4dccd93d832345 |
25-Nov-2010 |
Gloria Wang <gwang@google.com> |
Remove empty Widevine make files
Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
ibdrmframework/plugins/widevine/Android.mk
|
| 35f2d3997efe62ce7660ac558578ac5ca834f357 |
23-Nov-2010 |
Gloria Wang <gwang@google.com> |
am 24a90c26: am d9334934: Merge "Update of DRM Framework."
* commit '24a90c2674270fee0783bafa54fd5d845bdf0c18':
Update of DRM Framework.
|
| 5fc3edb13edb058f14e6550d295ce3e50e5ebf8c |
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
|
| dc91865622e3cc9ff0bb33b83f1d3b38cd7a6d7a |
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
ava/android/drm/DrmErrorEvent.java
ava/android/drm/DrmEvent.java
ava/android/drm/DrmManagerClient.java
ni/android_drm_DrmManagerClient.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
|
| e3afc288ddddeda4e771be71f15b166f8aaa01e1 |
03-Nov-2010 |
Gloria Wang <gwang@google.com> |
resolved conflicts for merge of a8d7b747 to master
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
|
| 1b42e92decd815c72ecc83d11f5c0c37f035c696 |
02-Nov-2010 |
Gloria Wang <gwang@google.com> |
Disable some logs
Change-Id: I05fcf6869916504367814fd2abd2b1af88619f5b
ommon/IDrmManagerService.cpp
rmserver/DrmManager.cpp
|
| c7b3ccc564448cb4b918728421f9402bc18278c5 |
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
ava/android/drm/DrmErrorEvent.java
ava/android/drm/DrmEvent.java
ava/android/drm/DrmInfoStatus.java
ava/android/drm/DrmManagerClient.java
ava/android/drm/DrmUtils.java
ni/android_drm_DrmManagerClient.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
|
| 6793a04d620b3181ce78703dd26033fe8bfa344c |
30-Oct-2010 |
Gloria Wang <gwang@google.com> |
Add support for WV plugin
Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
ibdrmframework/plugins/widevine/Android.mk
|
| a784d4ed25e632661e2549db8efd87eeaf78eac1 |
26-Oct-2010 |
Gloria Wang <gwang@google.com> |
Do not create drm directory here. Fix for bug 3134576.
Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
rmserver/DrmManagerService.cpp
|
| dc549d60f98d809f626c99de614960409a847054 |
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
rmioserver/DrmIOService.cpp
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
rmserver/StringTokenizer.cpp
ava/android/drm/DrmErrorEvent.java
ava/android/drm/DrmEvent.java
ava/android/drm/DrmInfoEvent.java
ava/android/drm/DrmManagerClient.java
ni/android_drm_DrmManagerClient.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
|
| b01e10c5bc0a29d1b0da96783b6d1582baeb2af2 |
16-Sep-2010 |
Joe Onorato <joeo@google.com> |
There is no @note javadoc tag.
Change-Id: I4bb4e0be518b01f2a81d870ff4ec9da81555afbd
ava/android/drm/DrmManagerClient.java
|
| 3802949f5cfe500b8bc41371ff99c82c9ed5d9c3 |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
Make DRM libraries optional
Change-Id: I0b591b75a035bc6d8049c85b595966845fedaa15
ommon/Android.mk
rmioserver/Android.mk
rmserver/Android.mk
ni/Android.mk
ibdrmframework/Android.mk
ibdrmframework/plugins/passthru/Android.mk
|
| beeb71dfd4ffe635daba3745515bb392f7c5ada2 |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: Iccb40c8c5df879288f35e0940c721d306fb75c12
ni/Android.mk
ibdrmframework/Android.mk
|
| 862438eb69297accde289230f4c4623b56a39458 |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: Idccb3f2499bbaac61099d8232cadd633b93ad846
ibdrmframework/plugins/passthru/Android.mk
|
| 7547b8eac6a4011683a93f51fdabf5a978e1f18c |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: I4aba42eabb2f959b5301bfd16f65fa6141d86ddc
rmserver/Android.mk
|
| 93548db645dd4fd2b9c1dd270421ac0b38de720e |
10-Sep-2010 |
Jean-Baptiste Queru <jbq@google.com> |
fix build
Change-Id: I603e317b774758add127d7fe386fd60dc16d3101
rmioserver/Android.mk
|
| d074e30ce44b9e33da43b67a4515b8986ca72b26 |
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
rmioserver/Android.mk
rmioserver/DrmIOService.cpp
rmioserver/main_drmioserver.cpp
rmserver/Android.mk
rmserver/DrmManager.cpp
rmserver/DrmManagerService.cpp
rmserver/StringTokenizer.cpp
rmserver/main_drmserver.cpp
ava/android/drm/DrmConvertedStatus.java
ava/android/drm/DrmEvent.java
ava/android/drm/DrmInfo.java
ava/android/drm/DrmInfoEvent.java
ava/android/drm/DrmInfoRequest.java
ava/android/drm/DrmInfoStatus.java
ava/android/drm/DrmManagerClient.java
ava/android/drm/DrmRights.java
ava/android/drm/DrmStore.java
ava/android/drm/DrmSupportInfo.java
ava/android/drm/DrmUtils.java
ava/android/drm/ProcessedData.java
ni/Android.mk
ni/android_drm_DrmManagerClient.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
|