diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-11-06 02:49:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-06 02:49:11 +0000 |
| commit | a4dd2e19f917f25b3eee36f499b126dc115e5446 (patch) | |
| tree | c11079e94ba87e90ddbe74322bfe9f41e042248d /drm/mediadrm | |
| parent | 5fa013ea79066ec47589f38f94f557d021bd56eb (diff) | |
| parent | 7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe (diff) | |
| download | frameworks_av-a4dd2e19f917f25b3eee36f499b126dc115e5446.zip frameworks_av-a4dd2e19f917f25b3eee36f499b126dc115e5446.tar.gz frameworks_av-a4dd2e19f917f25b3eee36f499b126dc115e5446.tar.bz2 | |
am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into lmp-mr1-dev
* commit '7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe':
Add missing secure stop methods
Diffstat (limited to 'drm/mediadrm')
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/DrmPlugin.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drm/mediadrm/plugins/clearkey/DrmPlugin.h b/drm/mediadrm/plugins/clearkey/DrmPlugin.h index 27df9cd..6139f1f 100644 --- a/drm/mediadrm/plugins/clearkey/DrmPlugin.h +++ b/drm/mediadrm/plugins/clearkey/DrmPlugin.h @@ -113,11 +113,21 @@ public: return android::ERROR_DRM_CANNOT_HANDLE; } + virtual status_t getSecureStop(Vector<uint8_t> const &ssid, Vector<uint8_t> &secureStop) { + UNUSED(ssid); + UNUSED(secureStop); + return android::ERROR_DRM_CANNOT_HANDLE; + } + virtual status_t releaseSecureStops(const Vector<uint8_t>& ssRelease) { UNUSED(ssRelease); return android::ERROR_DRM_CANNOT_HANDLE; } + virtual status_t releaseAllSecureStops() { + return android::ERROR_DRM_CANNOT_HANDLE; + } + virtual status_t getPropertyString( const String8& name, String8& value) const; |