Merge "Allow additional tags when restoring TaskRecord." (194378d3) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -2376,8 +2376,7 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
		activities.add(activity);
		}
		} else {
		Slog.e(TAG, "restoreTask: Unexpected name=" + name);
		XmlUtils.skipCurrentTag(in);
		handleUnknownTag(name, in);
		}
		}
		}
		@@ -2441,5 +2440,11 @@ class TaskRecord extends ConfigurationContainer implements TaskWindowContainerLi
		if (DEBUG_RECENTS) Slog.d(TAG_RECENTS, "Restored task=" + task);
		return task;
		}

		void handleUnknownTag(String name, XmlPullParser in)
		throws IOException, XmlPullParserException {
		Slog.e(TAG, "restoreTask: Unexpected name=" + name);
		XmlUtils.skipCurrentTag(in);
		}
		}
		}