summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2014-08-04 20:48:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-01 13:51:29 +0000
commitb63d63b8afa25694d1973988d7acdfebcd01a18d (patch)
tree88a37a7a3e984c9c6e63532bed01f95be7224412 /drm
parent44622db93a24219123facbbe14259000f90de728 (diff)
parent68b15554f6dca3b056eac517fe5fa2fd4ee80a33 (diff)
downloadframeworks_av-b63d63b8afa25694d1973988d7acdfebcd01a18d.zip
frameworks_av-b63d63b8afa25694d1973988d7acdfebcd01a18d.tar.gz
frameworks_av-b63d63b8afa25694d1973988d7acdfebcd01a18d.tar.bz2
Merge "Allow device to be unprovisioned" into lmp-dev
Diffstat (limited to 'drm')
-rw-r--r--drm/mediadrm/plugins/clearkey/DrmPlugin.h4
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;