Use removePackageLI instead of removing mPackages

When adding an system app via OTA, trying to remove it from mPackages
directly doesn't work. The ContentProviders and other things aren't
removed and point to the hidden system app's applicationInfo instead of
the updated app.

Bug: 6685263
Change-Id: I487cf518e0e3c60fae736e9b974617023a7dee8d

1 files changed, 5 insertions, 0 deletions

diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java
index 91cd458..d031686 100644
--- a/services/java/com/android/server/pm/Settings.java
+++ b/services/java/com/android/server/pm/Settings.java
@@ -2459,6 +2459,7 @@ final class Settings {
             pw.print("    nativeLibraryPath="); pw.println(ps.nativeLibraryPathString);
             pw.print("    versionCode="); pw.println(ps.versionCode);
             if (ps.pkg != null) {
+                pw.print("    applicationInfo="); pw.println(ps.pkg.applicationInfo.toString());
                 pw.print("    flags="); printFlags(pw, ps.pkg.applicationInfo.flags, FLAG_DUMP_SPEC); pw.println();
                 pw.print("    versionName="); pw.println(ps.pkg.mVersionName);
                 pw.print("    dataDir="); pw.println(ps.pkg.applicationInfo.dataDir);
@@ -2592,6 +2593,10 @@ final class Settings {
                     pw.print("    compat name=");
                     pw.println(ps.name);
                 }
+                if (ps.pkg != null && ps.pkg.applicationInfo != null) {
+                    pw.print("    applicationInfo=");
+                    pw.println(ps.pkg.applicationInfo.toString());
+                }
                 pw.print("    userId=");
                 pw.println(ps.appId);
                 pw.print("    sharedUser=");