Merge "Service: transmits empty station list" into sc-v2-dev (489cec02) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/broadcastradio/hal2/ProgramInfoCache.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -189,7 +189,8 @@ class ProgramInfoCache {
		removed.add(id);
		}
		}
		if (modified.isEmpty() && removed.isEmpty() && mComplete == chunk.isComplete()) {
		if (modified.isEmpty() && removed.isEmpty() && mComplete == chunk.isComplete()
		&& !chunk.isPurge()) {
		return null;
		}
		mComplete = chunk.isComplete();
		@@ -239,9 +240,10 @@ class ProgramInfoCache {
		}

		// Determine number of chunks we need to send.
		int numChunks = 0;
		int numChunks = purge ? 1 : 0;
		if (modified != null) {
		numChunks = roundUpFraction(modified.size(), maxNumModifiedPerChunk);
		numChunks = Math.max(numChunks,
		roundUpFraction(modified.size(), maxNumModifiedPerChunk));
		}
		if (removed != null) {
		numChunks = Math.max(numChunks, roundUpFraction(removed.size(), maxNumRemovedPerChunk));