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

Merge "Handles null outInfo in deleteSystemPackageLI" into qt-qpr1-dev

Browse Source 
am: 2b4f037ef7

Change-Id: I9f7858fb7af6a281cb38f56d6fa2b74fef96f45c
This commit is contained in:
Patrick Baumann
2019-10-31 10:02:29 -07:00
committed by android-build-merger
parent 75b82a0c8c 2b4f037ef7
commit 4b3ac2d51e
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -19047,10 +19047,11 @@ public class PackageManagerService extends IPackageManager.Stub
* Tries to delete system package. * Tries to delete system package.
*/ */
private void deleteSystemPackageLIF(DeletePackageAction action, PackageSetting deletedPs, private void deleteSystemPackageLIF(DeletePackageAction action, PackageSetting deletedPs,
int[] allUserHandles, int flags, PackageRemovedInfo outInfo, boolean writeSettings) int[] allUserHandles, int flags, @Nullable PackageRemovedInfo outInfo,
boolean writeSettings)
throws SystemDeleteException { throws SystemDeleteException {
final boolean applyUserRestrictions final boolean applyUserRestrictions =
= (allUserHandles != null) && (outInfo.origUsers != null); (allUserHandles != null) && outInfo != null && (outInfo.origUsers != null);
final PackageParser.Package deletedPkg = deletedPs.pkg; final PackageParser.Package deletedPkg = deletedPs.pkg;
// Confirm if the system package has been updated // Confirm if the system package has been updated
// An updated system app can be deleted. This will also have to restore // An updated system app can be deleted. This will also have to restore
@@ -19071,6 +19072,7 @@ public class PackageManagerService extends IPackageManager.Stub
} }
} }
if (outInfo != null) {
// Delete the updated package // Delete the updated package
outInfo.isRemovedPackageSystemUpdate = true; outInfo.isRemovedPackageSystemUpdate = true;
if (outInfo.removedChildPackages != null) { if (outInfo.removedChildPackages != null) {
@@ -19088,6 +19090,7 @@ public class PackageManagerService extends IPackageManager.Stub
} }
} }
} }
}
if (disabledPs.versionCode < deletedPs.versionCode) { if (disabledPs.versionCode < deletedPs.versionCode) {
// Delete data for downgrades // Delete data for downgrades
@@ -19116,7 +19119,8 @@ public class PackageManagerService extends IPackageManager.Stub
if (DEBUG_REMOVE) Slog.d(TAG, "Re-installing system package: " + disabledPs); if (DEBUG_REMOVE) Slog.d(TAG, "Re-installing system package: " + disabledPs);
try { try {
installPackageFromSystemLIF(disabledPs.codePathString, allUserHandles, installPackageFromSystemLIF(disabledPs.codePathString, allUserHandles,
outInfo.origUsers, deletedPs.getPermissionsState(), writeSettings); outInfo == null ? null : outInfo.origUsers, deletedPs.getPermissionsState(),
writeSettings);
} catch (PackageManagerException e) { } catch (PackageManagerException e) {
Slog.w(TAG, "Failed to restore system package:" + deletedPkg.packageName + ": " Slog.w(TAG, "Failed to restore system package:" + deletedPkg.packageName + ": "
+ e.getMessage()); + e.getMessage());