diff options
author | Jeff Tinker <jtinker@google.com> | 2014-11-07 00:17:03 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-07 00:17:03 +0000 |
commit | b7ea09ab665fbf3f51d42f742e07d1bbd1c192c8 (patch) | |
tree | 67460b0003c2a94460f53bcfe557f6a8a176bdd9 /drm | |
parent | 6200e7f43d977ad6698f018ee55e2f423ff8a87c (diff) | |
parent | 3b97d9d787ba3913ce7e9b1e0ddd0b938e5bf979 (diff) | |
download | frameworks_av-b7ea09ab665fbf3f51d42f742e07d1bbd1c192c8.zip frameworks_av-b7ea09ab665fbf3f51d42f742e07d1bbd1c192c8.tar.gz frameworks_av-b7ea09ab665fbf3f51d42f742e07d1bbd1c192c8.tar.bz2 |
am 3b97d9d7: am d556fad7: Fix build, update mock drm plugin
* commit '3b97d9d787ba3913ce7e9b1e0ddd0b938e5bf979':
Fix build, update mock drm plugin
Diffstat (limited to 'drm')
-rw-r--r-- | drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp | 25 | ||||
-rw-r--r-- | drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h | 2 |
2 files changed, 27 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()); diff --git a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h index 4b63299..d1d8058 100644 --- a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h +++ b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h @@ -88,7 +88,9 @@ namespace android { status_t unprovisionDevice(); status_t getSecureStops(List<Vector<uint8_t> > &secureStops); + status_t getSecureStop(Vector<uint8_t> const &ssid, Vector<uint8_t> &secureStop); status_t releaseSecureStops(Vector<uint8_t> const &ssRelease); + status_t releaseAllSecureStops(); status_t getPropertyString(String8 const &name, String8 &value ) const; status_t getPropertyByteArray(String8 const &name, |