Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33e17ae1 authored by Dan Cashman's avatar Dan Cashman
Browse files

PackageSignatures: bring back tag skipping on unknown element. 

Commit: 7ee17aa6 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
parent 431af2d3

services/core/java/com/android/server/pm/PackageSignatures.java

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ class PackageSignatures { 
                PackageManagerService.reportSettingsProblem(Log.WARN,

                        "Unknown element under <sigs>: "

                                + parser.getName());

                XmlUtils.skipCurrentTag(parser);

            }

        }

        return pos;