summaryrefslogtreecommitdiffstats
path: root/drm/drmserver
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-10-26 12:11:55 -0700
committerGloria Wang <gwang@google.com>2010-10-26 12:11:55 -0700
commitd6d4ba97bcb39bf6d0cde32ce7bef1753e420548 (patch)
tree4071f563bd7327f5e298c734c97a171da34eeeb5 /drm/drmserver
parentbbf03557f2008fad77bf9340460d4e6a28cbb957 (diff)
downloadframeworks_av-d6d4ba97bcb39bf6d0cde32ce7bef1753e420548.zip
frameworks_av-d6d4ba97bcb39bf6d0cde32ce7bef1753e420548.tar.gz
frameworks_av-d6d4ba97bcb39bf6d0cde32ce7bef1753e420548.tar.bz2
Do not create drm directory here. Fix for bug 3134576.
Change-Id: I1e26ff32b1c2d97464d544c2455eab0a726e3294
Diffstat (limited to 'drm/drmserver')
-rw-r--r--drm/drmserver/DrmManagerService.cpp17
1 files changed, 1 insertions, 16 deletions
diff --git a/drm/drmserver/DrmManagerService.cpp b/drm/drmserver/DrmManagerService.cpp
index 843dddb..cf9bab1 100644
--- a/drm/drmserver/DrmManagerService.cpp
+++ b/drm/drmserver/DrmManagerService.cpp
@@ -28,25 +28,10 @@
using namespace android;
#define SUCCESS 0
-#define DRM_DIRECTORY_PERMISSION 0700
-#define DRM_PLUGINS_ROOT "/data/drm/plugins"
-#define DRM_PLUGINS_NATIVE "/data/drm/plugins/native"
-#define DRM_PLUGINS_NATIVE_DATABASES "/data/drm/plugins/native/databases"
void DrmManagerService::instantiate() {
LOGV("instantiate");
-
- int res = mkdir(DRM_PLUGINS_ROOT, DRM_DIRECTORY_PERMISSION);
- if (SUCCESS == res || EEXIST == errno) {
- res = mkdir(DRM_PLUGINS_NATIVE, DRM_DIRECTORY_PERMISSION);
- if (SUCCESS == res || EEXIST == errno) {
- res = mkdir(DRM_PLUGINS_NATIVE_DATABASES, DRM_DIRECTORY_PERMISSION);
- if (SUCCESS == res || EEXIST == errno) {
- defaultServiceManager()
- ->addService(String16("drm.drmManager"), new DrmManagerService());
- }
- }
- }
+ defaultServiceManager()->addService(String16("drm.drmManager"), new DrmManagerService());
}
DrmManagerService::DrmManagerService() {