diff options
author | Jeff Tinker <jtinker@google.com> | 2014-11-06 02:49:11 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-06 02:49:11 +0000 |
commit | a4dd2e19f917f25b3eee36f499b126dc115e5446 (patch) | |
tree | c11079e94ba87e90ddbe74322bfe9f41e042248d /include | |
parent | 5fa013ea79066ec47589f38f94f557d021bd56eb (diff) | |
parent | 7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe (diff) | |
download | frameworks_av-a4dd2e19f917f25b3eee36f499b126dc115e5446.zip frameworks_av-a4dd2e19f917f25b3eee36f499b126dc115e5446.tar.gz frameworks_av-a4dd2e19f917f25b3eee36f499b126dc115e5446.tar.bz2 |
am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into lmp-mr1-dev
* commit '7ed62fb4a7401adc3e8b4e082bcfa21de443ebbe':
Add missing secure stop methods
Diffstat (limited to 'include')
-rw-r--r-- | include/media/IDrm.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/IDrm.h b/include/media/IDrm.h index 68de87a..affcbd7 100644 --- a/include/media/IDrm.h +++ b/include/media/IDrm.h @@ -73,8 +73,10 @@ struct IDrm : public IInterface { virtual status_t unprovisionDevice() = 0; 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; virtual status_t getPropertyString(String8 const &name, String8 &value) const = 0; virtual status_t getPropertyByteArray(String8 const &name, @@ -137,4 +139,3 @@ private: } // namespace android #endif // ANDROID_IDRM_H_ - |