diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-08-04 22:10:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-04 22:10:56 +0000 |
| commit | 58a07884861e3c28059cb5e452f79c274459aceb (patch) | |
| tree | ef1c5779d47fb284b70dbfdc01d48e2de522772e /drm | |
| parent | 11a4d099fd2cd3acf3de7210c0ef3e470254ebe8 (diff) | |
| parent | c2320223222fe4507b6d67f6b8b4001d26c77a9c (diff) | |
| download | frameworks_av-58a07884861e3c28059cb5e452f79c274459aceb.zip frameworks_av-58a07884861e3c28059cb5e452f79c274459aceb.tar.gz frameworks_av-58a07884861e3c28059cb5e452f79c274459aceb.tar.bz2 | |
am c2320223: Fix build break in mock drm plugin build
* commit 'c2320223222fe4507b6d67f6b8b4001d26c77a9c':
Fix build break in mock drm plugin build
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp | 6 | ||||
| -rw-r--r-- | drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp index 6efc712..2ea554b 100644 --- a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp +++ b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.cpp @@ -299,6 +299,12 @@ namespace android { return OK; } + status_t MockDrmPlugin::unprovisionDevice() + { + ALOGD("MockDrmPlugin::unprovisionDevice()"); + return OK; + } + status_t MockDrmPlugin::getSecureStops(List<Vector<uint8_t> > &secureStops) { Mutex::Autolock lock(mLock); diff --git a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h index 97d7052..4b63299 100644 --- a/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h +++ b/drm/mediadrm/plugins/mock/MockDrmCryptoPlugin.h @@ -85,6 +85,8 @@ namespace android { Vector<uint8_t> &certificate, Vector<uint8_t> &wrappedKey); + status_t unprovisionDevice(); + status_t getSecureStops(List<Vector<uint8_t> > &secureStops); status_t releaseSecureStops(Vector<uint8_t> const &ssRelease); |