Merge "Catch exceptions when reading SyncStatusInfo." (f7384478) · Commits · e / os / android_frameworks_base

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -2032,6 +2032,7 @@ public class SyncStorageEngine {
		int token;
		while ((token=in.readInt()) != STATUS_FILE_END) {
		if (token == STATUS_FILE_ITEM) {
		try {
		SyncStatusInfo status = new SyncStatusInfo(in);
		if (mAuthorities.indexOfKey(status.authorityId) >= 0) {
		status.pending = false;
		@@ -2040,6 +2041,9 @@ public class SyncStorageEngine {
		}
		mSyncStatus.put(status.authorityId, status);
		}
		} catch (Exception e) {
		Slog.e(TAG, "Unable to parse some sync status.", e);
		}
		} else {
		// Ooops.
		Slog.w(TAG, "Unknown status token: " + token);