merge from open-source master

Change-Id: If72ad6758c9e1bf77c38c4afec6b00ec9d5b89e4
This commit is contained in:
The Android Open Source Project
2010-05-03 16:19:19 -07:00
4 changed files with 48 additions and 24 deletions

View File

@@ -2363,7 +2363,7 @@ class PackageManagerService extends IPackageManager.Stub {
&& (p.applicationInfo.flags&ApplicationInfo.FLAG_PERSISTENT) != 0
&& (!mSafeMode || (p.applicationInfo.flags
&ApplicationInfo.FLAG_SYSTEM) != 0)) {
finalList.add(p.applicationInfo);
finalList.add(PackageParser.generateApplicationInfo(p, flags));
}
}
}