MediaRouteButton: Load drawables sequentially

It prevents loading same remote indicator drawables multiple times in the case
that two or more MediaRouteButtons present simulatenously.

Bug: 73641097
Test: Ran support v7 demos manually and make two
MediaRouteActionProviders present and check if the code works as
intended

Change-Id: I813ebf08c4d66bfc31eb229c9cddce05c1b70504

1 files changed, 18 insertions, 4 deletions

diff --git a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java
index 8876d516777..846022f59cd 100644
--- a/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java
+++ b/mediarouter/src/main/java/androidx/mediarouter/app/MediaRouteButton.java
@@ -165,7 +165,7 @@ public class MediaRouteButton extends View {
                 setRemoteIndicatorDrawableInternal(remoteIndicatorStaticState.newDrawable());
             } else {
                 mRemoteIndicatorLoader = new RemoteIndicatorLoader(remoteIndicatorStaticResId);
-                mRemoteIndicatorLoader.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+                mRemoteIndicatorLoader.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
             }
         }
 
@@ -484,7 +484,7 @@ public class MediaRouteButton extends View {
             }
             mRemoteIndicatorLoader = new RemoteIndicatorLoader(mRemoteIndicatorResIdToLoad);
             mRemoteIndicatorResIdToLoad = 0;
-            mRemoteIndicatorLoader.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            mRemoteIndicatorLoader.executeOnExecutor(AsyncTask.SERIAL_EXECUTOR);
         }
     }
 
@@ -640,12 +640,26 @@ public class MediaRouteButton extends View {
 
         @Override
         protected Drawable doInBackground(Void... params) {
-            return getContext().getResources().getDrawable(mResId);
+            Drawable.ConstantState remoteIndicatorState = sRemoteIndicatorCache.get(mResId);
+            if (remoteIndicatorState == null) {
+                return getContext().getResources().getDrawable(mResId);
+            } else {
+                return null;
+            }
         }
 
         @Override
         protected void onPostExecute(Drawable remoteIndicator) {
-            cacheAndReset(remoteIndicator);
+            if (remoteIndicator != null) {
+                cacheAndReset(remoteIndicator);
+            } else {
+                Drawable.ConstantState remoteIndicatorState = sRemoteIndicatorCache.get(mResId);
+                if (remoteIndicatorState != null) {
+                    remoteIndicator = remoteIndicatorState.newDrawable();
+                }
+                mRemoteIndicatorLoader = null;
+            }
+
             setRemoteIndicatorDrawableInternal(remoteIndicator);
         }