From 68b15554f6dca3b056eac517fe5fa2fd4ee80a33 Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Wed, 30 Apr 2014 10:19:03 -0700 Subject: Allow device to be unprovisioned bug: 12247651 Change-Id: I564ac8de3da2430342a028f4058e2c5ac2d85d5e --- media/libmediaplayerservice/Drm.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'media/libmediaplayerservice/Drm.cpp') diff --git a/media/libmediaplayerservice/Drm.cpp b/media/libmediaplayerservice/Drm.cpp index d50037f..d222316 100644 --- a/media/libmediaplayerservice/Drm.cpp +++ b/media/libmediaplayerservice/Drm.cpp @@ -417,6 +417,23 @@ status_t Drm::provideProvisionResponse(Vector const &response, return mPlugin->provideProvisionResponse(response, certificate, wrappedKey); } +status_t Drm::unprovisionDevice() { + Mutex::Autolock autoLock(mLock); + + if (mInitCheck != OK) { + return mInitCheck; + } + + if (mPlugin == NULL) { + return -EINVAL; + } + + if (!checkPermission("android.permission.REMOVE_DRM_CERTIFICATES")) { + return -EPERM; + } + + return mPlugin->unprovisionDevice(); +} status_t Drm::getSecureStops(List > &secureStops) { Mutex::Autolock autoLock(mLock); -- cgit v1.1