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

Merge "Fix purge bug for program list update" into tm-qpr-dev am: 8f70a3a4ac

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

Change-Id: I108fc9d830d7705806f42f094ad9137a7cbc2438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Weilin Xu
2022-07-18 18:28:14 +00:00
committed by Automerger Merge Worker
parent c11bab5bbe 8f70a3a4ac
commit f731308ceb
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/hardware/radio/ProgramList.java
View File

@@ -22,10 +22,11 @@ import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
import android.util.ArrayMap;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -41,7 +42,7 @@ public final class ProgramList implements AutoCloseable {
private final Object mLock = new Object();
private final Map<ProgramSelector.Identifier, RadioManager.ProgramInfo> mPrograms =
new HashMap<>();
new ArrayMap<>();
private final List<ListCallback> mListCallbacks = new ArrayList<>();
private final List<OnCompleteListener> mOnCompleteListeners = new ArrayList<>();
@@ -184,8 +185,14 @@ public final class ProgramList implements AutoCloseable {
listCallbacksCopied = new ArrayList<>(mListCallbacks);
if (chunk.isPurge()) {
for (ProgramSelector.Identifier id : mPrograms.keySet()) {
removeLocked(id, removedList);
Iterator<Map.Entry<ProgramSelector.Identifier, RadioManager.ProgramInfo>>
programsIterator = mPrograms.entrySet().iterator();
while (programsIterator.hasNext()) {
RadioManager.ProgramInfo removed = programsIterator.next().getValue();
if (removed != null) {
removedList.add(removed.getSelector().getPrimaryId());
}
programsIterator.remove();
}
}