Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "In theory the package manager now scans /vendor/app" into gingerbread

Browse Source
This commit is contained in:
Dianne Hackborn
2010-09-20 16:54:22 -07:00
committed by Android (Google) Code Review
parent a4270e7e1e 3b4bac7a2a
commit 4db643eb84
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/java/com/android/server/PackageManagerService.java
View File

@@ -222,6 +222,9 @@ class PackageManagerService extends IPackageManager.Stub {
// This is the object monitoring the system app dir. // This is the object monitoring the system app dir.
final FileObserver mSystemInstallObserver; final FileObserver mSystemInstallObserver;
// This is the object monitoring the system app dir.
final FileObserver mVendorInstallObserver;
// This is the object monitoring mAppInstallDir. // This is the object monitoring mAppInstallDir.
final FileObserver mAppInstallObserver; final FileObserver mAppInstallObserver;
@@ -234,6 +237,7 @@ class PackageManagerService extends IPackageManager.Stub {
final File mFrameworkDir; final File mFrameworkDir;
final File mSystemAppDir; final File mSystemAppDir;
final File mVendorAppDir;
final File mAppInstallDir; final File mAppInstallDir;
final File mDalvikCacheDir; final File mDalvikCacheDir;
@@ -927,6 +931,14 @@ class PackageManagerService extends IPackageManager.Stub {
scanDirLI(mSystemAppDir, PackageParser.PARSE_IS_SYSTEM scanDirLI(mSystemAppDir, PackageParser.PARSE_IS_SYSTEM
| PackageParser.PARSE_IS_SYSTEM_DIR, scanMode); | PackageParser.PARSE_IS_SYSTEM_DIR, scanMode);
// Collect all vendor packages.
mVendorAppDir = new File("/vendor/app");
mVendorInstallObserver = new AppDirObserver(
mVendorAppDir.getPath(), OBSERVER_EVENTS, true);
mVendorInstallObserver.startWatching();
scanDirLI(mVendorAppDir, PackageParser.PARSE_IS_SYSTEM
| PackageParser.PARSE_IS_SYSTEM_DIR, scanMode);
if (mInstaller != null) { if (mInstaller != null) {
if (DEBUG_UPGRADE) Log.v(TAG, "Running installd update commands"); if (DEBUG_UPGRADE) Log.v(TAG, "Running installd update commands");
mInstaller.moveFiles(); mInstaller.moveFiles();
@@ -2493,9 +2505,13 @@ class PackageManagerService extends IPackageManager.Stub {
} }
private void scanDirLI(File dir, int flags, int scanMode) { private void scanDirLI(File dir, int flags, int scanMode) {
Log.d(TAG, "Scanning app dir " + dir);
String[] files = dir.list(); String[] files = dir.list();
if (files == null) {
Log.d(TAG, "No files in app dir " + dir);
return;
}
Log.d(TAG, "Scanning app dir " + dir);
int i; int i;
for (i=0; i<files.length; i++) { for (i=0; i<files.length; i++) {