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

Merge "Service: transmits empty station list" am: 79b1a4da7a am: 865e1525c1 am: 4c1de9b10c am: e1e9f75a8c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1942313

Change-Id: I5d26c296fe6189b62c7d289628395c4a57e889de
This commit is contained in:
Treehugger Robot
2022-01-18 15:37:16 +00:00
committed by Automerger Merge Worker
parent 8c54dea251 e1e9f75a8c
commit 09e9e3b31c
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);
}
}
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));