Merge "Fixed a bug where the media entries are invisible after switching users" into rvc-dev am: 402d723892

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

Change-Id: If70b4fe4100ef09224ceec952baf1268d3e60016
This commit is contained in:
Selim Cinek
2020-06-26 20:29:17 +00:00
committed by Automerger Merge Worker

View File

@@ -193,12 +193,15 @@ class MediaDataManager(
private fun clearData() { private fun clearData() {
// Called on user change. Remove all current MediaData objects and inform listeners // Called on user change. Remove all current MediaData objects and inform listeners
val listenersCopy = listeners.toSet() val listenersCopy = listeners.toSet()
mediaEntries.forEach { val keyCopy = mediaEntries.keys.toMutableList()
// Clear the list first, to make sure callbacks from listeners if we have any entries
// are up to date
mediaEntries.clear()
keyCopy.forEach {
listenersCopy.forEach { listener -> listenersCopy.forEach { listener ->
listener.onMediaDataRemoved(it.key) listener.onMediaDataRemoved(it)
} }
} }
mediaEntries.clear()
} }
private fun removeAllForPackage(packageName: String) { private fun removeAllForPackage(packageName: String) {