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

Merge "Prune hidden system apps when removed via OTA" into jb-dev

Browse Source
This commit is contained in:
Kenny Root
2012-05-08 12:50:07 -07:00
committed by Android (Google) Code Review
parent fdb7412af3 c52d6fd043
commit 8a2fe26873
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/java/com/android/server/pm/PackageManagerService.java
View File

@@ -1063,23 +1063,29 @@ public class PackageManagerService extends IPackageManager.Stub {
mInstaller.moveFiles();
// Prune any system packages that no longer exist.
final List<String> possiblyDeletedSystemApps = new ArrayList<String>();
if (!mOnlyCore) {
Iterator<PackageSetting> psit = mSettings.mPackages.values().iterator();
while (psit.hasNext()) {
PackageSetting ps = psit.next();
if ((ps.pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0
&& !mPackages.containsKey(ps.name)
&& !mSettings.mDisabledSysPackages.containsKey(ps.name)) {
if ((ps.pkgFlags&ApplicationInfo.FLAG_SYSTEM) == 0
|| mPackages.containsKey(ps.name)) {
continue;
}
if (!mSettings.isDisabledSystemPackageLPr(ps.name)) {
psit.remove();
String msg = "System package " + ps.name
+ " no longer exists; wiping its data";
reportSettingsProblem(Log.WARN, msg);
mInstaller.remove(ps.name, 0);
sUserManager.removePackageForAllUsers(ps.name);
} else {
possiblyDeletedSystemApps.add(ps.name);
}
}
}
mAppInstallDir = new File(dataDir, "app");
//look for any incomplete package installations
ArrayList<PackageSetting> deletePkgsList = mSettings.getListOfIncompleteInstallPackagesLPr();
@@ -1104,6 +1110,21 @@ public class PackageManagerService extends IPackageManager.Stub {
mDrmAppInstallObserver.startWatching();
scanDirLI(mDrmAppPrivateInstallDir, PackageParser.PARSE_FORWARD_LOCK,
scanMode, 0);
/**
* Remove disable package settings for any system apps
* that were removed via an OTA.
*/
for (String deletedAppName : possiblyDeletedSystemApps) {
PackageParser.Package deletedPkg = mPackages.get(deletedAppName);
if (deletedPkg != null) {
mSettings.removeDisabledSystemPackageLPw(deletedAppName);
deletedPkg.applicationInfo.flags &= ~ApplicationInfo.FLAG_SYSTEM;
PackageSetting deletedPs = mSettings.mPackages.get(deletedAppName);
deletedPs.pkgFlags &= ~ApplicationInfo.FLAG_SYSTEM;
}
}
} else {
mAppInstallObserver = null;
mDrmAppInstallObserver = null;
@@ -3043,8 +3064,7 @@ public class PackageManagerService extends IPackageManager.Stub {
// Check to see if this package could be hiding/updating a system
// package. Must look for it either under the original or real
// package name depending on our state.
updatedPkg = mSettings.mDisabledSysPackages.get(
ps != null ? ps.name : pkg.packageName);
updatedPkg = mSettings.getDisabledSystemPkgLPr(ps != null ? ps.name : pkg.packageName);
}
// First check if this is a system package that may involve an update
if (updatedPkg != null && (parseFlags&PackageParser.PARSE_IS_SYSTEM) != 0) {
@@ -3523,7 +3543,7 @@ public class PackageManagerService extends IPackageManager.Stub {
mTransferedPackages.add(pkg.packageName);
}
if (mSettings.mDisabledSysPackages.get(pkg.packageName) != null) {
if (mSettings.isDisabledSystemPackageLPr(pkg.packageName)) {
pkg.applicationInfo.flags |= ApplicationInfo.FLAG_UPDATED_SYSTEM_APP;
}

10
services/java/com/android/server/pm/Settings.java
View File

@@ -102,7 +102,7 @@ final class Settings {
final HashMap<String, PackageSetting> mPackages =
new HashMap<String, PackageSetting>();
// List of replaced system applications
final HashMap<String, PackageSetting> mDisabledSysPackages =
private final HashMap<String, PackageSetting> mDisabledSysPackages =
new HashMap<String, PackageSetting>();
// These are the last platform API version we were using for
@@ -280,6 +280,14 @@ final class Settings {
return ret;
}
boolean isDisabledSystemPackageLPr(String name) {
return mDisabledSysPackages.containsKey(name);
}
void removeDisabledSystemPackageLPw(String name) {
mDisabledSysPackages.remove(name);
}
PackageSetting addPackageLPw(String name, String realName, File codePath, File resourcePath,
String nativeLibraryPathString, int uid, int vc, int pkgFlags) {
PackageSetting p = mPackages.get(name);