commit 645a920fd2c478c545c6bb659f2eab36545fe116
author Narayan Kamath <narayan@google.com> Thu May 01 13:52:44 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 01 13:52:44 2014 +0000
tree 5eadeb9932cefb5fb3b012ae9b1b5265e8aaa89d
parent 986b901ae280928e91193527f7c883b296fc62fc
parent 66309e2bf70607bc0ff2cf5c0769c2a37c4ce76d

Merge "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 800814d..cb437ed 100755
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -5246,7 +5246,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 {