From 584c4cdbf36681bee210bffecb81f7900fcfa1b6 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Mon, 29 Oct 2012 10:46:42 -0700 Subject: 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 --- services/java/com/android/server/pm/PackageManagerService.java | 4 ++-- 1 file 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 deletePkgsList = mSettings.getListOfIncompleteInstallPackagesLPr(); //clean up list -- cgit v1.2.3-59-g8ed1b