commit 8814cf426d0b021d78133b1df7fd28dfe576df36
author Ben Kwa <kenobi@google.com> Wed Jul 08 10:54:56 2015 -0700
committer Ben Kwa <kenobi@google.com> Wed Jul 08 10:56:17 2015 -0700
tree 060c7afc832ac643b8bf9ecb7e9b1d18d01bfe99
parent 221f5548c968ee433d14673ab04a75e079e979a9

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

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

diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java
index d16eab6..93d0692d 100755
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -1224,7 +1224,7 @@
 
         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

diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index 78f9f18..d047804 100644
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -1074,7 +1074,7 @@
 
         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=" +