diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-01 13:56:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 13:56:59 +0000 |
| commit | d85ded890d86d454a0571c63911ff911633e3a95 (patch) | |
| tree | 39fd13bde8e63742ab70268336cab655fc7bde86 /services/java | |
| parent | eb5734989b3ef5455359f8807684a860ad04c134 (diff) | |
| parent | 645a920fd2c478c545c6bb659f2eab36545fe116 (diff) | |
| download | frameworks_base-d85ded890d86d454a0571c63911ff911633e3a95.zip frameworks_base-d85ded890d86d454a0571c63911ff911633e3a95.tar.gz frameworks_base-d85ded890d86d454a0571c63911ff911633e3a95.tar.bz2 | |
am 645a920f: Merge "Fix OEM native library path bug."
* commit '645a920fd2c478c545c6bb659f2eab36545fe116':
Fix OEM native library path bug.
Diffstat (limited to 'services/java')
| -rwxr-xr-x | services/java/com/android/server/pm/PackageManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public class PackageManagerService extends IPackageManager.Stub { 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 { |