Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Service: transmits empty station list"

Browse Source
This commit is contained in:
Treehugger Robot
2022-01-18 14:57:51 +00:00
committed by Gerrit Code Review
parent 09dcc2da3e c7022e19a8
commit 79b1a4da7a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/broadcastradio/hal2/ProgramInfoCache.java
View File

@@ -189,7 +189,8 @@ class ProgramInfoCache {
removed.add(id); removed.add(id);
} }
} }
if (modified.isEmpty() && removed.isEmpty() && mComplete == chunk.isComplete()) { if (modified.isEmpty() && removed.isEmpty() && mComplete == chunk.isComplete()
&& !chunk.isPurge()) {
return null; return null;
} }
mComplete = chunk.isComplete(); mComplete = chunk.isComplete();
@@ -239,9 +240,10 @@ class ProgramInfoCache {
} }
// Determine number of chunks we need to send. // Determine number of chunks we need to send.
int numChunks = 0; int numChunks = purge ? 1 : 0;
if (modified != null) { if (modified != null) {
numChunks = roundUpFraction(modified.size(), maxNumModifiedPerChunk); numChunks = Math.max(numChunks,
roundUpFraction(modified.size(), maxNumModifiedPerChunk));
} }
if (removed != null) { if (removed != null) {
numChunks = Math.max(numChunks, roundUpFraction(removed.size(), maxNumRemovedPerChunk)); numChunks = Math.max(numChunks, roundUpFraction(removed.size(), maxNumRemovedPerChunk));