summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework/include/DrmManager.h
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-03-15 14:10:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-15 14:10:30 -0700
commit1006c80903c4e6b0554a3bc2e3585639c395927d (patch)
treef024dd66dba1d170242cff661ad3b7035a1bbe59 /drm/libdrmframework/include/DrmManager.h
parent99b1c9861c7cc1ee3c750b95ad823ad6a4dcfe65 (diff)
parent8d2577b9ac2f95f218db59a78447efd3c6a742dd (diff)
downloadframeworks_av-1006c80903c4e6b0554a3bc2e3585639c395927d.zip
frameworks_av-1006c80903c4e6b0554a3bc2e3585639c395927d.tar.gz
frameworks_av-1006c80903c4e6b0554a3bc2e3585639c395927d.tar.bz2
Merge "Bug fixes of DRM framework."
Diffstat (limited to 'drm/libdrmframework/include/DrmManager.h')
-rw-r--r--drm/libdrmframework/include/DrmManager.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drm/libdrmframework/include/DrmManager.h b/drm/libdrmframework/include/DrmManager.h
index c7276f9..af2c2a8 100644
--- a/drm/libdrmframework/include/DrmManager.h
+++ b/drm/libdrmframework/include/DrmManager.h
@@ -30,7 +30,6 @@ class IDrmManager;
class DrmRegistrationInfo;
class DrmUnregistrationInfo;
class DrmRightsAcquisitionInfo;
-class DrmContentIds;
class DrmConstraints;
class DrmMetadata;
class DrmRights;
@@ -141,7 +140,7 @@ private:
bool canHandle(int uniqueId, const String8& path);
private:
- static Vector<int> mUniqueIdVector;
+ Vector<int> mUniqueIdVector;
static const String8 EMPTY_STRING;
int mDecryptSessionId;