summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Tinker <jtinker@google.com>2014-11-06 02:33:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-06 02:33:31 +0000
commit621c6f3b13f96b0e84163f355c6f3024cd3afb2e (patch)
tree22da0a427d3b854fc19173f0041a08ef41419d21
parent26645298400c0ae3a95731388364263d6a914ee4 (diff)
parent57481590b98518865e266004e7ca4737abd5508d (diff)
downloadframeworks_native-621c6f3b13f96b0e84163f355c6f3024cd3afb2e.zip
frameworks_native-621c6f3b13f96b0e84163f355c6f3024cd3afb2e.tar.gz
frameworks_native-621c6f3b13f96b0e84163f355c6f3024cd3afb2e.tar.bz2
Merge "Add missing secure stop methods" into lmp-mr1-dev
-rw-r--r--include/media/drm/DrmAPI.h2
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.