commit 88daefd40767695f7e8a67d1d52dfaac2ab6bdb6
author Christopher Tate <ctate@android.com> Fri Feb 07 23:37:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 07 23:37:03 2014 +0000
tree 1ded4dcc4a3da26646c858b9a8445dc24db41655
parent cd4cf932d994c392ca6da21dc32a26d6d467b721
parent 379bb6ed4ea4de035569b04018f84d7ce95a8036

am 379bb6ed: am ff27e6bc: Merge "Use canonical path for /vendor/app"

* commit '379bb6ed4ea4de035569b04018f84d7ce95a8036':
  Use canonical path for /vendor/app

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

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index df83fd7..ef1d258 100755
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -1307,6 +1307,11 @@
 
             // Collect all vendor packages.
             File vendorAppDir = new File("/vendor/app");
+            try {
+                vendorAppDir = vendorAppDir.getCanonicalFile();
+            } catch (IOException e) {
+                // failed to look up canonical path, continue with original one
+            }
             mVendorInstallObserver = new AppDirObserver(
                 vendorAppDir.getPath(), OBSERVER_EVENTS, true, false);
             mVendorInstallObserver.startWatching();