diff options
| author | Jeff Tinker <jtinker@google.com> | 2013-07-22 15:54:42 -0700 | 
|---|---|---|
| committer | Jeff Tinker <jtinker@google.com> | 2013-07-23 11:32:15 -0700 | 
| commit | f355f18aa2cc1706761e373fe19298a9ccc9c75a (patch) | |
| tree | 72caa7cb946dd0de42de5dc30e83b5e99137485d /drm/drmserver | |
| parent | 20f4754b7e687d3718a0a0a585f2c9ac22e2567d (diff) | |
| download | frameworks_av-f355f18aa2cc1706761e373fe19298a9ccc9c75a.zip frameworks_av-f355f18aa2cc1706761e373fe19298a9ccc9c75a.tar.gz frameworks_av-f355f18aa2cc1706761e373fe19298a9ccc9c75a.tar.bz2  | |
Remove obsolete drm manager code
bug: 9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
Diffstat (limited to 'drm/drmserver')
| -rw-r--r-- | drm/drmserver/DrmManager.cpp | 15 | ||||
| -rw-r--r-- | drm/drmserver/DrmManagerService.cpp | 5 | 
2 files changed, 0 insertions, 20 deletions
diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp index bfaf4bc..dccd23d 100644 --- a/drm/drmserver/DrmManager.cpp +++ b/drm/drmserver/DrmManager.cpp @@ -175,21 +175,6 @@ DrmMetadata* DrmManager::getMetadata(int uniqueId, const String8* path) {      return NULL;  } -status_t DrmManager::installDrmEngine(int uniqueId, const String8& absolutePath) { -    Mutex::Autolock _l(mLock); -    mPlugInManager.loadPlugIn(absolutePath); - -    IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(absolutePath); -    rDrmEngine.initialize(uniqueId); -    rDrmEngine.setOnInfoListener(uniqueId, this); - -    DrmSupportInfo* info = rDrmEngine.getSupportInfo(0); -    mSupportInfoToPlugInIdMap.add(*info, absolutePath); -    delete info; - -    return DRM_NO_ERROR; -} -  bool DrmManager::canHandle(int uniqueId, const String8& path, const String8& mimeType) {      Mutex::Autolock _l(mLock);      const String8 plugInId = getSupportedPlugInId(mimeType); diff --git a/drm/drmserver/DrmManagerService.cpp b/drm/drmserver/DrmManagerService.cpp index bbd3b7f..2b71904 100644 --- a/drm/drmserver/DrmManagerService.cpp +++ b/drm/drmserver/DrmManagerService.cpp @@ -87,11 +87,6 @@ status_t DrmManagerService::setDrmServiceListener(      return DRM_NO_ERROR;  } -status_t DrmManagerService::installDrmEngine(int uniqueId, const String8& drmEngineFile) { -    ALOGV("Entering installDrmEngine"); -    return mDrmManager->installDrmEngine(uniqueId, drmEngineFile); -} -  DrmConstraints* DrmManagerService::getConstraints(              int uniqueId, const String8* path, const int action) {      ALOGV("Entering getConstraints from content");  | 
