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

am 11d7502b: am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo

Browse Source 
Merge commit '11d7502b35374da12168004e277bcc87f4f7bb50' into kraken

* commit '11d7502b35374da12168004e277bcc87f4f7bb50':
  Fix issue #593153: Broadcast time out when sending...
This commit is contained in:
Dianne Hackborn
2010-04-14 12:11:17 -07:00
committed by Android Git Automerger
parent fff02afa01 11d7502b35
commit 093d621c2f
5 changed files with 131 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,6 +181,8 @@ class PackageManagerService extends IPackageManager.Stub {
static final int SCAN_NEW_INSTALL = 1<<4;
static final int SCAN_NO_PATHS = 1<<5;
static final int REMOVE_CHATTY = 1<<16;
static final ComponentName DEFAULT_CONTAINER_COMPONENT = new ComponentName(
"com.android.defcontainer",
"com.android.defcontainer.DefaultContainerService");
@@ -6092,7 +6094,8 @@ class PackageManagerService extends IPackageManager.Stub {
}
synchronized (mInstallLock) {
res = deletePackageLI(packageName, deleteCodeAndResources, flags, info);
res = deletePackageLI(packageName, deleteCodeAndResources,
flags | REMOVE_CHATTY, info);
}
if(res && sendBroadCast) {
@@ -6158,7 +6161,7 @@ class PackageManagerService extends IPackageManager.Stub {
if (outInfo != null) {
outInfo.removedPackage = packageName;
}
removePackageLI(p, true);
removePackageLI(p, (flags&REMOVE_CHATTY) != 0);
// Retrieve object to delete permissions for shared user later on
PackageSetting deletedPs;
synchronized (mPackages) {
@@ -9625,8 +9628,7 @@ class PackageManagerService extends IPackageManager.Stub {
continue;
}
// Parse package
int parseFlags = PackageParser.PARSE_CHATTY |
PackageParser.PARSE_ON_SDCARD | mDefParseFlags;
int parseFlags = PackageParser.PARSE_ON_SDCARD | mDefParseFlags;
doGc = true;
synchronized (mInstallLock) {
final PackageParser.Package pkg = scanPackageLI(new File(codePath),