Merge "Destroy no longer needed media players." into main (7bf3599f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/controls/ui/MediaCarouselController.kt

+7 −1

Original line number	Diff line number	Diff line
		@@ -731,6 +731,7 @@ constructor(
		removePlayer(existingSmartspaceMediaKey, dismissMediaData = false)
		removedPlayer?.run {
		debugLogger.logPotentialMemoryLeak(existingSmartspaceMediaKey)
		onDestroy()
		}
		}

		@@ -1302,6 +1303,7 @@ internal object MediaPlayerData {
		val removedPlayer = removeMediaPlayer(key)
		if (removedPlayer != null && removedPlayer != player) {
		debugLogger?.logPotentialMemoryLeak(key)
		removedPlayer.onDestroy()
		}
		val sortKey =
		MediaSortKey(
		@@ -1329,6 +1331,7 @@ internal object MediaPlayerData {
		val removedPlayer = removeMediaPlayer(key)
		if (!update && removedPlayer != null && removedPlayer != player) {
		debugLogger?.logPotentialMemoryLeak(key)
		removedPlayer.onDestroy()
		}
		val sortKey =
		MediaSortKey(
		@@ -1357,7 +1360,10 @@ internal object MediaPlayerData {
		// MediaPlayer should not be visible
		// no need to set isDismissed flag.
		val removedPlayer = removeMediaPlayer(newKey)
		removedPlayer?.run { debugLogger?.logPotentialMemoryLeak(newKey) }
		removedPlayer?.run {
		debugLogger?.logPotentialMemoryLeak(newKey)
		onDestroy()
		}
		mediaData.put(newKey, it)
		}
		}