summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorChristopher Tate <ctate@android.com>2014-02-07 23:30:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-07 23:30:24 +0000
commitff27e6bc44097485abfde24f396399e5eec9ff6d (patch)
tree4a8965aae6efbaf903ef1189b8e4b3640d33fa12 /services
parentcccae25fc7cd3daf68dee3d3ca7665a5ea12f097 (diff)
parent41a17c2e72d61be0a060bf43b669623462a23f13 (diff)
downloadframeworks_base-ff27e6bc44097485abfde24f396399e5eec9ff6d.zip
frameworks_base-ff27e6bc44097485abfde24f396399e5eec9ff6d.tar.gz
frameworks_base-ff27e6bc44097485abfde24f396399e5eec9ff6d.tar.bz2
Merge "Use canonical path for /vendor/app"
Diffstat (limited to 'services')
-rwxr-xr-xservices/java/com/android/server/pm/PackageManagerService.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index 7e244b9..7ea1fce 100755
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -1301,6 +1301,11 @@ public class PackageManagerService extends IPackageManager.Stub {
// 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();