PackageSignatures: bring back tag skipping on unknown element.

Commit: 7ee17aa6b228a007129147c7a6e9ecba2a40d892 moved the
skipCurrentTag call when reading certs into the branch directly
dealing with <cert /> tags to eliminate issues for the <pastSigs />
tag, but in doing so will cause bad parses when encountering unknown
elements.  Restore the previous behavior when an unknown tag is
encountered.

Bug: 64686581
Test: Builds, boots.
Change-Id: I3e2850b3dc1660ca43b7b5d01bf345290d11bac0

diff --git a/services/core/java/com/android/server/pm/PackageSignatures.java b/services/core/java/com/android/server/pm/PackageSignatures.java
index bfc858f..0229a37 100644 (file)
--- a/services/core/java/com/android/server/pm/PackageSignatures.java
+++ b/services/core/java/com/android/server/pm/PackageSignatures.java
@@ -296,6 +296,7 @@ class PackageSignatures {
                 PackageManagerService.reportSettingsProblem(Log.WARN,
                         "Unknown element under <sigs>: "
                                 + parser.getName());
+                XmlUtils.skipCurrentTag(parser);
             }
         }
         return pos;