am 2a638f08: Merge "Clear the volume cache for all inactive state transitions" into lmp-dev
* commit '2a638f08dc4c750bfd0e358768ddde98c7f23b09':
Clear the volume cache for all inactive state transitions
diff --git a/services/core/java/com/android/server/media/MediaSessionStack.java b/services/core/java/com/android/server/media/MediaSessionStack.java
index a9bc818..e464be7 100644
--- a/services/core/java/com/android/server/media/MediaSessionStack.java
+++ b/services/core/java/com/android/server/media/MediaSessionStack.java
@@ -94,8 +94,8 @@
mSessions.add(0, record);
clearCache();
return true;
- } else if (newState == PlaybackState.STATE_PAUSED) {
- // Just clear the volume cache in this case
+ } else if (!MediaSession.isActiveState(newState)) {
+ // Just clear the volume cache when a state goes inactive
mCachedVolumeDefault = null;
}
return false;