summaryrefslogtreecommitdiffstats
path: root/drm/drmserver
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-03-15 10:52:28 -0700
committerGloria Wang <gwang@google.com>2011-03-15 11:17:22 -0700
commit5c96c65f692f8c2297d213c88450dd601d2b5c1f (patch)
treefeacc3cf000a8c991d5759a5e1c4ed2db301c995 /drm/drmserver
parent6f3a75e13b86a3f40fe34e3ebd17b118791a73a4 (diff)
downloadframeworks_base-5c96c65f692f8c2297d213c88450dd601d2b5c1f.zip
frameworks_base-5c96c65f692f8c2297d213c88450dd601d2b5c1f.tar.gz
frameworks_base-5c96c65f692f8c2297d213c88450dd601d2b5c1f.tar.bz2
Bug fixes of DRM framework.
- Add death listener to clean-up drmserver appropriately when drmserver died. - Remove "static" declaration of mUniqueIdVector because it was not needed to be static variable. - Remove "class DrmContentIds;" because the class does not exist. - contentPath in saveRights() could be empty because it is not required by some DRM schemes. - Fix naming convention to use sXXX for static variables. - Fix typo Change-Id: I7d440488fc074c200f1009d1bafafeffebd690b2
Diffstat (limited to 'drm/drmserver')
-rw-r--r--drm/drmserver/DrmManager.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index 305bafc..f44c06d 100644
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -37,7 +37,6 @@
using namespace android;
-Vector<int> DrmManager::mUniqueIdVector;
const String8 DrmManager::EMPTY_STRING("");
DrmManager::DrmManager() :