Debounce calls to onNotificationRefreshRequired()

Author: nift4

libraries/session/src/main/java/androidx/media3/session/MediaSessionLegacyStub.java

@@ -141,13 +141,18 @@
   private final boolean playIfSuppressed;
   private final HandlerThread compatSessionInteractionThread;
   private final Handler compatSessionInteractionHandler;
+  private final Runnable callOnNotificationRefreshRequiredRunnable =
+      this::callOnNotificationRefreshRequiredIfNeeded;
+  private final Runnable requestNotificationRefreshRunnable =
+      () -> notificationRefreshRequiredPending = true;
 
   private volatile long connectionTimeoutMs;
   @Nullable private FutureCallback<Bitmap> pendingBitmapLoadCallback;
   @Nullable private VolumeProviderCompat volumeProviderCompat;
   private int sessionFlags;
   @Nullable private LegacyError legacyError;
   private Bundle legacyExtras;
+  private boolean notificationRefreshRequiredPending;
   private ImmutableList<CommandButton> customLayout;
   private ImmutableList<CommandButton> mediaButtonPreferences;
   private SessionCommands availableSessionCommands;
@@ -1083,9 +1088,7 @@ public void updateLegacySessionPlaybackState(PlayerWrapper playerWrapper, boolea
           postOrRunForCompatSession(
               () -> {
                 sessionCompat.setPlaybackState(playbackStateCompat);
-                if (notify) {
-                  sessionImpl.onNotificationRefreshRequired();
-                }
+                requestNotificationRefresh(notify);
               });
         });
   }
@@ -1222,6 +1225,29 @@ private static void sendCustomCommandResultWhenReady(
         MoreExecutors.directExecutor());
   }
 
+  private void callOnNotificationRefreshRequiredIfNeeded() {
+    if (notificationRefreshRequiredPending) {
+      sessionImpl.onNotificationRefreshRequired();
+      notificationRefreshRequiredPending = false;
+    }
+  }
+
+  private void requestNotificationRefresh(boolean postRunnable) {
+    if (compatSessionInteractionHandler.getLooper().isCurrentThread()) {
+      notificationRefreshRequiredPending = true;
+    } else {
+      compatSessionInteractionHandler.post(requestNotificationRefreshRunnable);
+    }
+    if (postRunnable) {
+      postOnNotificationRefreshRequiredRunnable();
+    }
+  }
+
+  private void postOnNotificationRefreshRequiredRunnable() {
+    compatSessionInteractionHandler.removeCallbacks(callOnNotificationRefreshRequiredRunnable);
+    compatSessionInteractionHandler.post(callOnNotificationRefreshRequiredRunnable);
+  }
+
   private static <T> void ignoreFuture(Future<T> unused) {
     // no-op
   }
@@ -1547,7 +1573,7 @@ public void onMediaItemTransition(
                   LegacyConversions.getRatingCompatStyle(mediaItem.mediaMetadata.userRating));
             }
             sessionCompat.setPlaybackState(playbackStateCompat);
-            sessionImpl.onNotificationRefreshRequired();
+            requestNotificationRefresh(true);
           });
     }
 
@@ -1575,9 +1601,7 @@ private void updateQueue(Timeline timeline, boolean notify) {
         postOrRunForCompatSession(
             () -> {
               setQueue(/* queue= */ null);
-              if (notify) {
-                sessionImpl.onNotificationRefreshRequired();
-              }
+              requestNotificationRefresh(notify);
             });
         return;
       }
@@ -1629,9 +1653,7 @@ private void handleBitmapFuturesAllCompletedAndSetQueue(
       // Framework MediaSession#setQueue() uses ParceledListSlice,
       // which means we can safely send long lists.
       setQueue(queueItemList);
-      if (notify) {
-        sessionImpl.onNotificationRefreshRequired();
-      }
+      requestNotificationRefresh(notify);
     }
 
     @Override
@@ -1680,7 +1702,7 @@ public void onAudioAttributesChanged(int seq, AudioAttributes audioAttributes) {
                 return;
               }
               sessionCompat.setPlaybackToLocal(audioAttributes.getStreamType());
-              sessionImpl.onNotificationRefreshRequired();
+              requestNotificationRefresh(true);
             });
       }
     }
@@ -1697,7 +1719,7 @@ public void onDeviceInfoChanged(int seq, DeviceInfo deviceInfo) {
             return;
           }
           sessionCompat.setPlaybackToLocal(streamType);
-          sessionImpl.onNotificationRefreshRequired();
+          requestNotificationRefresh(true);
         });
       } else {
         postOrRunForCompatSession(() -> {
@@ -1706,7 +1728,7 @@ public void onDeviceInfoChanged(int seq, DeviceInfo deviceInfo) {
             return;
           }
           sessionCompat.setPlaybackToRemote(volumeProviderCompat);
-          sessionImpl.onNotificationRefreshRequired();
+          requestNotificationRefresh(true);
         });
       }
     }
@@ -1751,7 +1773,7 @@ private void updateMetadataIfChanged(boolean notify) {
           && Objects.equals(lastMediaUri, newMediaUri)
           && lastDurationMs == newDurationMs) {
         if (notify) {
-          sessionImpl.onNotificationRefreshRequired();
+          postOnNotificationRefreshRequiredRunnable();
         }
         return;
       }
@@ -1789,7 +1811,7 @@ public void onSuccess(Bitmap result) {
                                 newMediaUri,
                                 newDurationMs,
                                 /* artworkBitmap= */ result));
-                        sessionImpl.onNotificationRefreshRequired();
+                        requestNotificationRefresh(true);
                       });
                 }
 
@@ -1813,9 +1835,7 @@ public void onFailure(Throwable t) {
             setMetadata(
                 LegacyConversions.convertToMediaMetadataCompat(
                     newMediaMetadata, newMediaId, newMediaUri, newDurationMs, artworkBitmapFinal));
-            if (notify) {
-              sessionImpl.onNotificationRefreshRequired();
-            }
+            requestNotificationRefresh(notify);
           });
     }
   }