diff options
| author | Kenny Root <kroot@google.com> | 2012-10-29 17:14:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-29 17:14:51 -0700 |
| commit | ca60ba1874a6537b42854b52cd766ebf1a8c8189 (patch) | |
| tree | fa475a933e7738dfdb1b0f75519b529f0022cdc5 /services | |
| parent | 0da554acfbf7cf0b8e522c5b8b83588cf6f72ddf (diff) | |
| parent | 584c4cdbf36681bee210bffecb81f7900fcfa1b6 (diff) | |
| download | frameworks_base-ca60ba1874a6537b42854b52cd766ebf1a8c8189.zip frameworks_base-ca60ba1874a6537b42854b52cd766ebf1a8c8189.tar.gz frameworks_base-ca60ba1874a6537b42854b52cd766ebf1a8c8189.tar.bz2 | |
Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 4 |
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 6ef39ac..83672c5 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 |