summaryrefslogtreecommitdiffstats
path: root/drm/drmserver
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-12-14 13:53:31 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-14 13:53:31 -0800
commit2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c (patch)
treea1031e278f98ee35c02b14f322e4f1f0c60ae9e1 /drm/drmserver
parent5805f995ef365bf00fcccd5c1f948086c17ec75e (diff)
parent26c2a6bf34b370d467cab4753e5a4b187ba62c0f (diff)
downloadframeworks_av-2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c.zip
frameworks_av-2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c.tar.gz
frameworks_av-2a3d6e1b6cfd2d564a48371598fdc664ea40fa8c.tar.bz2
am 3f6a7d1e: am d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
* commit '3f6a7d1ee961a4544563932b7499535dc1cac1ec': Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit 9f704f6c46a171357e49c411c83458b9d4565f3b.
Diffstat (limited to 'drm/drmserver')
-rw-r--r--drm/drmserver/DrmManager.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index f6552dd..3abf3d3 100644
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -99,12 +99,11 @@ void DrmManager::removeUniqueId(int uniqueId) {
status_t DrmManager::loadPlugIns() {
- String8 pluginDirPath("/system/lib/drm");
- loadPlugIns(pluginDirPath);
-
String8 vendorPluginDirPath("/vendor/lib/drm");
loadPlugIns(vendorPluginDirPath);
+ String8 pluginDirPath("/system/lib/drm");
+ loadPlugIns(pluginDirPath);
return DRM_NO_ERROR;
}