Initial contribution from Sony Corporation.
authoraimitakeshi <aimitakeshi@gmail.com>
Thu, 29 Jul 2010 01:12:27 +0000 (10:12 +0900)
committeraimitakeshi <aimitakeshi@gmail.com>
Wed, 1 Sep 2010 06:40:00 +0000 (15:40 +0900)
commitd074e30ce44b9e33da43b67a4515b8986ca72b26
treecea9a809ad3b678713d10b938eb21f0d792a89d8
parentf470ed8630e9e648727443b065b9f1c69fee34d6
  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
67 files changed:
api/current.xml
cmds/servicemanager/service_manager.c
drm/common/Android.mk [new file with mode: 0644]
drm/common/DrmConstraints.cpp [new file with mode: 0644]
drm/common/DrmConvertedStatus.cpp [new file with mode: 0644]
drm/common/DrmEngineBase.cpp [new file with mode: 0644]
drm/common/DrmInfo.cpp [new file with mode: 0644]
drm/common/DrmInfoEvent.cpp [new file with mode: 0644]
drm/common/DrmInfoRequest.cpp [new file with mode: 0644]
drm/common/DrmInfoStatus.cpp [new file with mode: 0644]
drm/common/DrmRights.cpp [new file with mode: 0644]
drm/common/DrmSupportInfo.cpp [new file with mode: 0644]
drm/common/IDrmIOService.cpp [new file with mode: 0644]
drm/common/IDrmManagerService.cpp [new file with mode: 0644]
drm/common/IDrmServiceListener.cpp [new file with mode: 0644]
drm/common/ReadWriteUtils.cpp [new file with mode: 0644]
drm/drmioserver/Android.mk [new file with mode: 0644]
drm/drmioserver/DrmIOService.cpp [new file with mode: 0644]
drm/drmioserver/main_drmioserver.cpp [new file with mode: 0644]
drm/drmserver/Android.mk [new file with mode: 0644]
drm/drmserver/DrmManager.cpp [new file with mode: 0644]
drm/drmserver/DrmManagerService.cpp [new file with mode: 0644]
drm/drmserver/StringTokenizer.cpp [new file with mode: 0644]
drm/drmserver/main_drmserver.cpp [new file with mode: 0644]
drm/java/android/drm/DrmConvertedStatus.java [new file with mode: 0644]
drm/java/android/drm/DrmEvent.java [new file with mode: 0644]
drm/java/android/drm/DrmInfo.java [new file with mode: 0644]
drm/java/android/drm/DrmInfoEvent.java [new file with mode: 0644]
drm/java/android/drm/DrmInfoRequest.java [new file with mode: 0644]
drm/java/android/drm/DrmInfoStatus.java [new file with mode: 0644]
drm/java/android/drm/DrmManagerClient.java [new file with mode: 0644]
drm/java/android/drm/DrmRights.java [new file with mode: 0644]
drm/java/android/drm/DrmStore.java [new file with mode: 0644]
drm/java/android/drm/DrmSupportInfo.java [new file with mode: 0644]
drm/java/android/drm/DrmUtils.java [new file with mode: 0644]
drm/java/android/drm/ProcessedData.java [new file with mode: 0644]
drm/jni/Android.mk [new file with mode: 0644]
drm/jni/android_drm_DrmManagerClient.cpp [new file with mode: 0644]
drm/libdrmframework/Android.mk [new file with mode: 0644]
drm/libdrmframework/DrmManagerClient.cpp [new file with mode: 0644]
drm/libdrmframework/DrmManagerClientImpl.cpp [new file with mode: 0644]
drm/libdrmframework/include/DrmIOService.h [new file with mode: 0644]
drm/libdrmframework/include/DrmManager.h [new file with mode: 0644]
drm/libdrmframework/include/DrmManagerClientImpl.h [new file with mode: 0644]
drm/libdrmframework/include/DrmManagerService.h [new file with mode: 0644]
drm/libdrmframework/include/IDrmIOService.h [new file with mode: 0644]
drm/libdrmframework/include/IDrmManagerService.h [new file with mode: 0644]
drm/libdrmframework/include/IDrmServiceListener.h [new file with mode: 0644]
drm/libdrmframework/include/PlugInManager.h [new file with mode: 0644]
drm/libdrmframework/include/ReadWriteUtils.h [new file with mode: 0644]
drm/libdrmframework/include/StringTokenizer.h [new file with mode: 0644]
drm/libdrmframework/plugins/Android.mk [new file with mode: 0644]
drm/libdrmframework/plugins/common/include/DrmEngineBase.h [new file with mode: 0644]
drm/libdrmframework/plugins/common/include/IDrmEngine.h [new file with mode: 0644]
drm/libdrmframework/plugins/passthru/Android.mk [new file with mode: 0644]
drm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h [new file with mode: 0644]
drm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp [new file with mode: 0644]
include/drm/DrmConstraints.h [new file with mode: 0644]
include/drm/DrmConvertedStatus.h [new file with mode: 0644]
include/drm/DrmInfo.h [new file with mode: 0644]
include/drm/DrmInfoEvent.h [new file with mode: 0644]
include/drm/DrmInfoRequest.h [new file with mode: 0644]
include/drm/DrmInfoStatus.h [new file with mode: 0644]
include/drm/DrmManagerClient.h [new file with mode: 0644]
include/drm/DrmRights.h [new file with mode: 0644]
include/drm/DrmSupportInfo.h [new file with mode: 0644]
include/drm/drm_framework_common.h [new file with mode: 0644]