diff options
| author | James Dong <jdong@google.com> | 2011-12-14 13:53:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-14 13:53:31 -0800 |
| commit | 29e97f169d87490e4755e8b7608e6324367e752f (patch) | |
| tree | 2898e9495a3dca3f6e8d642f4fb71e8f6e0f25c1 /drm | |
| parent | 54b9f98417a075645c0b57e1f041817e422a645f (diff) | |
| parent | 3f6a7d1ee961a4544563932b7499535dc1cac1ec (diff) | |
| download | frameworks_base-29e97f169d87490e4755e8b7608e6324367e752f.zip frameworks_base-29e97f169d87490e4755e8b7608e6324367e752f.tar.gz frameworks_base-29e97f169d87490e4755e8b7608e6324367e752f.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')
| -rw-r--r-- | drm/drmserver/DrmManager.cpp | 5 |
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; } |