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

Notifications starting paused shall still be subject to timeout.

Browse Source 
Bug: 169271494
Test: Manual
Change-Id: Iebb4f113d73179d7314ae1c6db3856ee0fd10b07
This commit is contained in:
Jeff DeCew
2020-10-12 14:11:22 -04:00
parent e23a6745d0
commit c1b65c7387
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/media/MediaTimeoutListener.kt
View File

@@ -46,7 +46,7 @@ class MediaTimeoutListener @Inject constructor(
/** /**
* Callback representing that a media object is now expired: * Callback representing that a media object is now expired:
* @param token Media session unique identifier * @param token Media session unique identifier
* @param pauseTimeuot True when expired for {@code PAUSED_MEDIA_TIMEOUT} * @param pauseTimeout True when expired for {@code PAUSED_MEDIA_TIMEOUT}
*/ */
lateinit var timeoutCallback: (String, Boolean) -> Unit lateinit var timeoutCallback: (String, Boolean) -> Unit
@@ -57,11 +57,10 @@ class MediaTimeoutListener @Inject constructor(
// Having an old key means that we're migrating from/to resumption. We should update // Having an old key means that we're migrating from/to resumption. We should update
// the old listener to make sure that events will be dispatched to the new location. // the old listener to make sure that events will be dispatched to the new location.
val migrating = oldKey != null && key != oldKey val migrating = oldKey != null && key != oldKey
var wasPlaying = false
if (migrating) { if (migrating) {
val reusedListener = mediaListeners.remove(oldKey) val reusedListener = mediaListeners.remove(oldKey)
if (reusedListener != null) { if (reusedListener != null) {
wasPlaying = reusedListener.playing ?: false val wasPlaying = reusedListener.playing ?: false
if (DEBUG) Log.d(TAG, "migrating key $oldKey to $key, for resumption") if (DEBUG) Log.d(TAG, "migrating key $oldKey to $key, for resumption")
reusedListener.mediaData = data reusedListener.mediaData = data
reusedListener.key = key reusedListener.key = key
@@ -159,9 +158,8 @@ class MediaTimeoutListener @Inject constructor(
Log.v(TAG, "Execute timeout for $key") Log.v(TAG, "Execute timeout for $key")
} }
timedOut = true timedOut = true
if (dispatchEvents) { // this event is async, so it's safe even when `dispatchEvents` is false
timeoutCallback(key, timedOut) timeoutCallback(key, timedOut)
}
}, PAUSED_MEDIA_TIMEOUT) }, PAUSED_MEDIA_TIMEOUT)
} else { } else {
expireMediaTimeout(key, "playback started - $state, $key") expireMediaTimeout(key, "playback started - $state, $key")