am ca60ba18: Merge "Move app-lib definition up for system app scanning" into jb-mr1-dev

* commit 'ca60ba1874a6537b42854b52cd766ebf1a8c8189':
  Move app-lib definition up for system app scanning
This commit is contained in:
Kenny Root
2012-10-29 17:18:04 -07:00
committed by Android Git Automerger

View File

@ -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