commit d85ded890d86d454a0571c63911ff911633e3a95
author Narayan Kamath <narayan@google.com> Thu May 01 13:56:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 01 13:56:59 2014 +0000
tree 39fd13bde8e63742ab70268336cab655fc7bde86
parent eb5734989b3ef5455359f8807684a860ad04c134
parent 645a920fd2c478c545c6bb659f2eab36545fe116

am 645a920f: Merge "Fix OEM native library path bug."

* commit '645a920fd2c478c545c6bb659f2eab36545fe116':
  Fix OEM native library path bug.

services/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index 070c038..bf489b7 100755
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -5253,7 +5253,7 @@
         if (FileUtils.contains(Environment.getRootDirectory(), codePath)) {
             codeRoot = Environment.getRootDirectory();
         } else if (FileUtils.contains(Environment.getOemDirectory(), codePath)) {
-            codeRoot = Environment.getRootDirectory();
+            codeRoot = Environment.getOemDirectory();
         } else if (FileUtils.contains(Environment.getVendorDirectory(), codePath)) {
             codeRoot = Environment.getVendorDirectory();
         } else {