diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-02 14:59:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-02 14:59:51 -0700 |
| commit | a8d7b7477d99dd2671e6232e157da9954bf4699f (patch) | |
| tree | 1d7dc40888d00b25724c1b82e63ea26521737fab /drm/libdrmframework/include/DrmManagerService.h | |
| parent | 6fb9316f6bd72b406bbfc61bd210281744eea9c1 (diff) | |
| parent | ef8a810b3b11d177a64111125eaa44bb76624414 (diff) | |
| download | frameworks_base-a8d7b7477d99dd2671e6232e157da9954bf4699f.zip frameworks_base-a8d7b7477d99dd2671e6232e157da9954bf4699f.tar.gz frameworks_base-a8d7b7477d99dd2671e6232e157da9954bf4699f.tar.bz2 | |
am ef8a810b: Merge "Update of DRM framework"
* commit 'ef8a810b3b11d177a64111125eaa44bb76624414':
Update of DRM framework
Diffstat (limited to 'drm/libdrmframework/include/DrmManagerService.h')
| -rw-r--r-- | drm/libdrmframework/include/DrmManagerService.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drm/libdrmframework/include/DrmManagerService.h b/drm/libdrmframework/include/DrmManagerService.h index f455e15..4a3aeae 100644 --- a/drm/libdrmframework/include/DrmManagerService.h +++ b/drm/libdrmframework/include/DrmManagerService.h @@ -50,15 +50,13 @@ public: void removeUniqueId(int uniqueId); - status_t loadPlugIns(int uniqueId); + void addClient(int uniqueId); - status_t loadPlugIns(int uniqueId, const String8& plugInDirPath); + void removeClient(int uniqueId); status_t setDrmServiceListener( int uniqueId, const sp<IDrmServiceListener>& drmServiceListener); - status_t unloadPlugIns(int uniqueId); - status_t installDrmEngine(int uniqueId, const String8& drmEngineFile); DrmConstraints* getConstraints(int uniqueId, const String8* path, const int action); @@ -100,6 +98,8 @@ public: DecryptHandle* openDecryptSession(int uniqueId, int fd, int offset, int length); + DecryptHandle* openDecryptSession(int uniqueId, const char* uri); + status_t closeDecryptSession(int uniqueId, DecryptHandle* decryptHandle); status_t initializeDecryptUnit(int uniqueId, DecryptHandle* decryptHandle, |