Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca60ba18 authored by Kenny Root's avatar Kenny Root Committed by Android (Google) Code Review
Browse files

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

parents 0da554ac 584c4cdb

services/java/com/android/server/pm/PackageManagerService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1009,6 +1009,8 @@ public class PackageManagerService extends IPackageManager.Stub { 




            File dataDir = Environment.getDataDirectory();

            File dataDir = Environment.getDataDirectory();

            mAppDataDir = new File(dataDir, "data");

            mAppDataDir = new File(dataDir, "data");

            mAppInstallDir = new File(dataDir, "app");

            mAppLibInstallDir = new File(dataDir, "app-lib");

            mAsecInternalPath = new File(dataDir, "app-asec").getPath();

            mAsecInternalPath = new File(dataDir, "app-asec").getPath();

            mUserAppDataDir = new File(dataDir, "user");

            mUserAppDataDir = new File(dataDir, "user");

            mDrmAppPrivateInstallDir = new File(dataDir, "app-private");

            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

            //look for any incomplete package installations

            ArrayList<PackageSetting> deletePkgsList = mSettings.getListOfIncompleteInstallPackagesLPr();

            ArrayList<PackageSetting> deletePkgsList = mSettings.getListOfIncompleteInstallPackagesLPr();

            //clean up list

            //clean up list