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

Commit 8814cf42 authored by Ben Kwa's avatar Ben Kwa
Browse files

Fix XML early-outs.

Fix an incorrect check that was causing the XML parsing code to early
abort prior to completely deserializing the ActivityRecord and its
contents.

BUG=22348567

Change-Id: I7cfb171c4bc46bd5319e3bfdb4cc36b225f14407
parent 221f5548
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1224,7 +1224,7 @@ final class ActivityRecord {

        int event;
        while (((event = in.next()) != XmlPullParser.END_DOCUMENT) &&
                (event != XmlPullParser.END_TAG || in.getDepth() < outerDepth)) {
                (event != XmlPullParser.END_TAG || in.getDepth() >= outerDepth)) {
            if (event == XmlPullParser.START_TAG) {
                final String name = in.getName();
                if (TaskPersister.DEBUG)
+1 −1
Original line number Diff line number Diff line
@@ -1074,7 +1074,7 @@ final class TaskRecord {

        int event;
        while (((event = in.next()) != XmlPullParser.END_DOCUMENT) &&
                (event != XmlPullParser.END_TAG || in.getDepth() < outerDepth)) {
                (event != XmlPullParser.END_TAG || in.getDepth() >= outerDepth)) {
            if (event == XmlPullParser.START_TAG) {
                final String name = in.getName();
                if (TaskPersister.DEBUG) Slog.d(TaskPersister.TAG, "TaskRecord: START_TAG name=" +