diff options
author | Jeff Tinker <jtinker@google.com> | 2014-11-06 02:48:18 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-06 02:48:18 +0000 |
commit | cbd9e8d34c029fa45e1fef451a71466bf4154582 (patch) | |
tree | 57ac2bb1c940af913ad838878e990a7d9070c448 /include/media | |
parent | 585cccc7ff934dc1f078053e3102903d6bc8bc15 (diff) | |
parent | 522110485465a05f4602ad42ba14a18b11184cca (diff) | |
download | frameworks_native-cbd9e8d34c029fa45e1fef451a71466bf4154582.zip frameworks_native-cbd9e8d34c029fa45e1fef451a71466bf4154582.tar.gz frameworks_native-cbd9e8d34c029fa45e1fef451a71466bf4154582.tar.bz2 |
am 52211048: am 621c6f3b: Merge "Add missing secure stop methods" into lmp-mr1-dev
* commit '522110485465a05f4602ad42ba14a18b11184cca':
Add missing secure stop methods
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/drm/DrmAPI.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/drm/DrmAPI.h b/include/media/drm/DrmAPI.h index 4633b7e..49939fd 100644 --- a/include/media/drm/DrmAPI.h +++ b/include/media/drm/DrmAPI.h @@ -209,7 +209,9 @@ namespace android { // confirmed. The persisted record on the client is only removed after positive // confirmation that the server received the message using releaseSecureStops(). virtual status_t getSecureStops(List<Vector<uint8_t> > &secureStops) = 0; + virtual status_t getSecureStop(Vector<uint8_t> const &ssid, Vector<uint8_t> &secureStop) = 0; virtual status_t releaseSecureStops(Vector<uint8_t> const &ssRelease) = 0; + virtual status_t releaseAllSecureStops() = 0; // Read a property value given the device property string. There are a few forms // of property access methods, depending on the data type returned. |