Merge "Sync extras bundle comparison can throw NPE" (b3b91cea) · Commits · e / os / android_frameworks_base

core/java/android/content/PeriodicSync.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,8 @@ import android.os.Bundle;
		import android.os.Parcel;
		import android.accounts.Account;

		import java.util.Objects;

		/**
		* Value type that contains information about a periodic sync.
		*/
		@@ -144,7 +146,9 @@ public class PeriodicSync implements Parcelable {
		if (!b2.containsKey(key)) {
		return false;
		}
		if (!b1.get(key).equals(b2.get(key))) {
		// Null check. According to ContentResolver#validateSyncExtrasBundle null-valued keys
		// are allowed in the bundle.
		if (!Objects.equals(b1.get(key), b2.get(key))) {
		return false;
		}
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ import java.util.HashSet;
		import java.util.Iterator;
		import java.util.List;
		import java.util.Map;
		import java.util.Objects;
		import java.util.Random;
		import java.util.Set;

		@@ -3372,7 +3373,7 @@ public class SyncManager {
		if (!smaller.containsKey(key)) {
		return false;
		}
		if (!bigger.get(key).equals(smaller.get(key))) {
		if (!Objects.equals(bigger.get(key), smaller.get(key))) {
		return false;
		}
		}
		@@ -3380,7 +3381,6 @@ public class SyncManager {
		}

		/**
		* TODO: Get rid of this when we separate sync settings extras from dev specified extras.
		* @return true if the provided key is used by the SyncManager in scheduling the sync.
		*/
		private static boolean isSyncSetting(String key) {

services/tests/servicestests/src/com/android/server/content/SyncManagerTest.java

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		package com.android.server.content;

		import android.os.Bundle;

		import junit.framework.TestCase;

		public class SyncManagerTest extends TestCase {

		final String KEY_1 = "key_1";
		final String KEY_2 = "key_2";

		public void testSyncExtrasEquals_WithNull() throws Exception {
		Bundle b1 = new Bundle();
		Bundle b2 = new Bundle();

		b1.putString(KEY_1, null);
		b2.putString(KEY_1, null);

		assertTrue("Null extra not properly compared between bundles.",
		SyncManager.syncExtrasEquals(b1, b2, false /* don't care about system extras */));
		}

		public void testSyncExtrasEqualsBigger_WithNull() throws Exception {
		Bundle b1 = new Bundle();
		Bundle b2 = new Bundle();

		b1.putString(KEY_1, null);
		b2.putString(KEY_1, null);

		b1.putString(KEY_2, "bla");
		b2.putString(KEY_2, "bla");

		assertTrue("Extras not properly compared between bundles.",
		SyncManager.syncExtrasEquals(b1, b2, false /* don't care about system extras */));
		}

		public void testSyncExtrasEqualsFails_differentValues() throws Exception {
		Bundle b1 = new Bundle();
		Bundle b2 = new Bundle();

		b1.putString(KEY_1, null);
		b2.putString(KEY_1, null);

		b1.putString(KEY_2, "bla");
		b2.putString(KEY_2, "ble"); // different key

		assertFalse("Extras considered equal when they are different.",
		SyncManager.syncExtrasEquals(b1, b2, false /* don't care about system extras */));
		}

		public void testSyncExtrasEqualsFails_differentNulls() throws Exception {
		Bundle b1 = new Bundle();
		Bundle b2 = new Bundle();

		b1.putString(KEY_1, null);
		b2.putString(KEY_1, "bla"); // different key

		b1.putString(KEY_2, "ble");
		b2.putString(KEY_2, "ble");

		assertFalse("Extras considered equal when they are different.",
		SyncManager.syncExtrasEquals(b1, b2, false /* don't care about system extras */));
		}
		}