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

Commit 0fad2271 authored by Ben Kwa's avatar Ben Kwa Committed by Android (Google) Code Review
Browse files

Merge "Fix XML early-outs."

parents 55f44450 8814cf42

services/core/java/com/android/server/am/ActivityRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -1278,7 +1278,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)

services/core/java/com/android/server/am/TaskRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,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=" +