diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-22 11:43:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 11:43:09 -0700 |
| commit | 66044c17924f56ee838e1b4262e1f64f7723aac2 (patch) | |
| tree | 91d3d558c7e92e8d47e4d1aa8bdf8bec3883de79 /include/drm | |
| parent | e50b799dc28c523c43d066d2f2a01747a52563c2 (diff) | |
| parent | fc4c13be8ce8c2d05432d855c2c61548abef3385 (diff) | |
| download | frameworks_base-66044c17924f56ee838e1b4262e1f64f7723aac2.zip frameworks_base-66044c17924f56ee838e1b4262e1f64f7723aac2.tar.gz frameworks_base-66044c17924f56ee838e1b4262e1f64f7723aac2.tar.bz2 | |
am fc4c13be: am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1
* commit 'fc4c13be8ce8c2d05432d855c2c61548abef3385':
Add one more field in DecryptHandle to support bug 4126624
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_framework_common.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/drm/drm_framework_common.h b/include/drm/drm_framework_common.h index 35d417b..d2d1d7e 100644 --- a/include/drm/drm_framework_common.h +++ b/include/drm/drm_framework_common.h @@ -297,6 +297,12 @@ public: */ KeyedVector<DrmCopyControl, int> copyControlVector; + /** + * Defines a vector for any extra data the DRM plugin wants to send + * to the native code + */ + KeyedVector<String8, String8> extendedData; + public: DecryptHandle(): decryptId(INVALID_VALUE), |