summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2014-11-06 02:33:37 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-06 02:33:37 +0000
commit19a3f69d9d5398db62ee7b15f2c13052d7ee9f07 (patch)
treecf8ab0afd5e431df089fb7a45499fd1981ba4fc4 /drm
parent74adca9ad30b7f8a70d40c5237bade0d16c4ea58 (diff)
parent3c1285e8f86bd497e14c14fb6df7b42072ef52bd (diff)
downloadframeworks_av-19a3f69d9d5398db62ee7b15f2c13052d7ee9f07.zip
frameworks_av-19a3f69d9d5398db62ee7b15f2c13052d7ee9f07.tar.gz
frameworks_av-19a3f69d9d5398db62ee7b15f2c13052d7ee9f07.tar.bz2
Merge "Add missing secure stop methods" into lmp-mr1-dev
Diffstat (limited to 'drm')
-rw-r--r--drm/mediadrm/plugins/clearkey/DrmPlugin.h10
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;