summaryrefslogtreecommitdiff
path: root/services/java/com/android/server/pm
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2012-10-29 10:46:42 -0700
committerKenny Root <kroot@google.com>2012-10-29 10:46:42 -0700
commit584c4cdbf36681bee210bffecb81f7900fcfa1b6 (patch)
treed81b1ae7a50dbfaa3dba8640e2b6ae4d5dc1db35 /services/java/com/android/server/pm
parentdbcec903c858b65c78620e2b06238e42ff4d12da (diff)
Move app-lib definition up for system app scanning
System apps were getting the wrong path because app-lib directory was defined after the scanning of packages. Bug: 7425516 Change-Id: I7a7a6b2a74f846c84516440ee950099bdc564d0b
Diffstat (limited to 'services/java/com/android/server/pm')
-rw-r--r--services/java/com/android/server/pm/PackageManagerService.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java
index 6ef39ac10733..83672c540c2d 100644
--- a/services/java/com/android/server/pm/PackageManagerService.java
+++ b/services/java/com/android/server/pm/PackageManagerService.java
@@ -1009,6 +1009,8 @@ public class PackageManagerService extends IPackageManager.Stub {
File dataDir = Environment.getDataDirectory();
mAppDataDir = new File(dataDir, "data");
+ mAppInstallDir = new File(dataDir, "app");
+ mAppLibInstallDir = new File(dataDir, "app-lib");
mAsecInternalPath = new File(dataDir, "app-asec").getPath();
mUserAppDataDir = new File(dataDir, "user");
mDrmAppPrivateInstallDir = new File(dataDir, "app-private");
@@ -1218,8 +1220,6 @@ public class PackageManagerService extends IPackageManager.Stub {
}
}
- mAppInstallDir = new File(dataDir, "app");
- mAppLibInstallDir = new File(dataDir, "app-lib");
//look for any incomplete package installations
ArrayList<PackageSetting> deletePkgsList = mSettings.getListOfIncompleteInstallPackagesLPr();
//clean up list