Conflict resolution CL to ag/868720 when cp'ing to mnc-mr1-release (b22f3f2d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/content/SyncStorageEngine.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ import android.util.Pair;
		import android.util.SparseArray;
		import android.util.ArrayMap;
		import android.util.Xml;
		import android.util.EventLog;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.ArrayUtils;
		@@ -1892,9 +1893,14 @@ public class SyncStorageEngine extends Handler {
		if ("authority".equals(tagName)) {
		authority = parseAuthority(parser, version);
		periodicSync = null;
		if (authority != null) {
		if (authority.ident > highestAuthorityId) {
		highestAuthorityId = authority.ident;
		}
		} else {
		EventLog.writeEvent(0x534e4554, "26513719", -1,
		"Malformed authority");
		}
		} else if (XML_TAG_LISTEN_FOR_TICKLES.equals(tagName)) {
		parseListenForTickles(parser);
		}