diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-08-04 20:56:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-04 20:56:24 +0000 |
| commit | e2209ffea3f23bf711b732c6b3aa33320f2d2cc0 (patch) | |
| tree | 0488a9238652ac87900a4f428942f2ee5a9b7753 /drm | |
| parent | 4ae6b2de588bdac03effd94b5ac33225ba0466c1 (diff) | |
| parent | b63d63b8afa25694d1973988d7acdfebcd01a18d (diff) | |
| download | frameworks_av-e2209ffea3f23bf711b732c6b3aa33320f2d2cc0.zip frameworks_av-e2209ffea3f23bf711b732c6b3aa33320f2d2cc0.tar.gz frameworks_av-e2209ffea3f23bf711b732c6b3aa33320f2d2cc0.tar.bz2 | |
am b63d63b8: Merge "Allow device to be unprovisioned" into lmp-dev
* commit 'b63d63b8afa25694d1973988d7acdfebcd01a18d':
Allow device to be unprovisioned
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/mediadrm/plugins/clearkey/DrmPlugin.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drm/mediadrm/plugins/clearkey/DrmPlugin.h b/drm/mediadrm/plugins/clearkey/DrmPlugin.h index bfbc6bf..27df9cd 100644 --- a/drm/mediadrm/plugins/clearkey/DrmPlugin.h +++ b/drm/mediadrm/plugins/clearkey/DrmPlugin.h @@ -104,6 +104,10 @@ public: return android::ERROR_DRM_CANNOT_HANDLE; } + virtual status_t unprovisionDevice() { + return android::ERROR_DRM_CANNOT_HANDLE; + } + virtual status_t getSecureStops(List<Vector<uint8_t> >& secureStops) { UNUSED(secureStops); return android::ERROR_DRM_CANNOT_HANDLE; |