diff options
| author | Jeff Tinker <jtinker@google.com> | 2014-08-04 20:56:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-04 20:56:23 +0000 |
| commit | 6a331b9179dd92ac35077f0982885db8067b6fc8 (patch) | |
| tree | 52008f77109bdb42fd68b529604bfb599bf804ef | |
| parent | 755d35f5fad7821f853f3d315b41cf2e3f1e38fd (diff) | |
| parent | 812e039aeb42c1a3c8bb8246c114f54115a335da (diff) | |
| download | frameworks_native-6a331b9179dd92ac35077f0982885db8067b6fc8.zip frameworks_native-6a331b9179dd92ac35077f0982885db8067b6fc8.tar.gz frameworks_native-6a331b9179dd92ac35077f0982885db8067b6fc8.tar.bz2 | |
am 812e039a: Merge "Allow device to be unprovisioned" into lmp-dev
* commit '812e039aeb42c1a3c8bb8246c114f54115a335da':
Allow device to be unprovisioned
| -rw-r--r-- | include/media/drm/DrmAPI.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/drm/DrmAPI.h b/include/media/drm/DrmAPI.h index fc6b49c..4633b7e 100644 --- a/include/media/drm/DrmAPI.h +++ b/include/media/drm/DrmAPI.h @@ -189,6 +189,9 @@ namespace android { Vector<uint8_t> &certificate, Vector<uint8_t> &wrapped_key) = 0; + // Remove device provisioning. + virtual status_t unprovisionDevice() = 0; + // A means of enforcing the contractual requirement for a concurrent stream // limit per subscriber across devices is provided via SecureStop. SecureStop // is a means of securely monitoring the lifetime of sessions. Since playback |