Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09e9e3b3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Service: transmits empty station list" am: 79b1a4da am: 865e1525... 

Merge "Service: transmits empty station list" am: 79b1a4da am: 865e1525 am: 4c1de9b1 am: e1e9f75a

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

Change-Id: I5d26c296fe6189b62c7d289628395c4a57e889de
parents 8c54dea2 e1e9f75a

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));