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

resolved conflicts for merge of d9ee01a9 to kraken

Browse Source 
Change-Id: I645177513e6dfa4b3b02c0061b8026bde4acde8d
This commit is contained in:
Jeff Brown
2010-03-30 23:49:17 -07:00
parent 2e41ffe7cf d9ee01a95c
commit 767225d820
8 changed files with 91 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6303,7 +6303,7 @@ class PackageManagerService extends IPackageManager.Stub {
Log.i(TAG, "Removing non-system package:"+p.packageName);
// Kill application pre-emptively especially for apps on sd.
killApplication(packageName, p.applicationInfo.uid);
ret = deleteInstalledPackageLI (p, deleteCodeAndResources, flags, outInfo);
ret = deleteInstalledPackageLI(p, deleteCodeAndResources, flags, outInfo);
}
return ret;
}
@@ -7634,10 +7634,11 @@ class PackageManagerService extends IPackageManager.Stub {
}
void setFlags(int pkgFlags) {
this.pkgFlags = (pkgFlags & ApplicationInfo.FLAG_SYSTEM) |
(pkgFlags & ApplicationInfo.FLAG_FORWARD_LOCK) |
(pkgFlags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) |
(pkgFlags & ApplicationInfo.FLAG_NEVER_ENCRYPT);
this.pkgFlags = pkgFlags & (
ApplicationInfo.FLAG_SYSTEM |
ApplicationInfo.FLAG_FORWARD_LOCK |
ApplicationInfo.FLAG_EXTERNAL_STORAGE |;
ApplicationInfo.FLAG_NEVER_ENCRYPT);
}
}
@@ -9642,7 +9643,7 @@ class PackageManagerService extends IPackageManager.Stub {
}
// Parse package
int parseFlags = PackageParser.PARSE_CHATTY |
PackageParser.PARSE_ON_SDCARD | mDefParseFlags;
PackageParser.PARSE_ON_SDCARD | mDefParseFlags;
PackageParser pp = new PackageParser(codePath);
pp.setSeparateProcesses(mSeparateProcesses);
final PackageParser.Package pkg = pp.parsePackage(new File(codePath),
@@ -9718,7 +9719,7 @@ class PackageManagerService extends IPackageManager.Stub {
if (res) {
pkgList.add(pkgName);
} else {
Slog.e(TAG, "Failed to delete pkg from sdcard : " + pkgName);
Slog.e(TAG, "Failed to delete pkg from sdcard : " + pkgName);
failedList.add(args);
}
}