summaryrefslogtreecommitdiffstats
path: root/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2014-11-05 20:11:10 -0800
committerJeff Tinker <jtinker@google.com>2014-11-05 20:15:16 -0800
commit85c737a67e1b679251fce7f456ae79eefdc15e07 (patch)
tree607ec3bca7bcd0e1ffbfa83f5462145f4f7854e4 /drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
parent2514d080c8a54ff603a45d7e336de668fe7329db (diff)
downloadframeworks_av-85c737a67e1b679251fce7f456ae79eefdc15e07.zip
frameworks_av-85c737a67e1b679251fce7f456ae79eefdc15e07.tar.gz
frameworks_av-85c737a67e1b679251fce7f456ae79eefdc15e07.tar.bz2
Fix build, update mock drm plugin
Change-Id: I9b0f031e19d6d3359d74c17b4b521642bad37936
Diffstat (limited to 'drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp')
-rw-r--r--drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp25
1 files changed, 25 insertions, 0 deletions
diff --git a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
index 2ea554b..7eac0a1 100644
--- a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
+++ b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp
@@ -305,6 +305,24 @@ namespace android {
return OK;
}
+ status_t MockDrmPlugin::getSecureStop(Vector<uint8_t> const &ssid, Vector<uint8_t> &secureStop)
+ {
+ Mutex::Autolock lock(mLock);
+ ALOGD("MockDrmPlugin::getSecureStop()");
+
+ // Properties used in mock test, set by cts test app returned from mock plugin
+ // byte[] mock-secure-stop -> first secure stop in list
+
+ ssize_t index = mByteArrayProperties.indexOfKey(String8("mock-secure-stop"));
+ if (index < 0) {
+ ALOGD("Missing 'mock-secure-stop' parameter for mock");
+ return BAD_VALUE;
+ } else {
+ secureStop = mByteArrayProperties.valueAt(index);
+ }
+ return OK;
+ }
+
status_t MockDrmPlugin::getSecureStops(List<Vector<uint8_t> > &secureStops)
{
Mutex::Autolock lock(mLock);
@@ -349,6 +367,13 @@ namespace android {
return OK;
}
+ status_t MockDrmPlugin::releaseAllSecureStops()
+ {
+ Mutex::Autolock lock(mLock);
+ ALOGD("MockDrmPlugin::releaseAllSecureStops()");
+ return OK;
+ }
+
status_t MockDrmPlugin::getPropertyString(String8 const &name, String8 &value) const
{
ALOGD("MockDrmPlugin::getPropertyString(name=%s)", name.string());