summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2011-01-12 09:31:46 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-12 09:31:46 -0800
commit70e8d9cb554702802a6bcf7ef5e466bbd0fc30f1 (patch)
tree4715d1e1c7ac47a047eea5030d2687326087dd4f
parent89b911194ede10e36d394cdee932ff998133d070 (diff)
parentcbba720a460f49a9d16afcc7e85c4564d7d945a1 (diff)
downloadframeworks_base-70e8d9cb554702802a6bcf7ef5e466bbd0fc30f1.zip
frameworks_base-70e8d9cb554702802a6bcf7ef5e466bbd0fc30f1.tar.gz
frameworks_base-70e8d9cb554702802a6bcf7ef5e466bbd0fc30f1.tar.bz2
Merge "Bug 3229711"
-rw-r--r--drm/drmserver/DrmManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index b6e0c30..ef7d274 100644
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -87,7 +87,7 @@ void DrmManager::removeUniqueId(int uniqueId) {
}
status_t DrmManager::loadPlugIns() {
- String8 pluginDirPath("/system/lib/drm/plugins/native");
+ String8 pluginDirPath("/system/lib/drm");
return loadPlugIns(pluginDirPath);
}