Sanity check while updating volume in MediaRouteChooserDialog

Bug 6720224

When a window dies it's possible to receive a lingering ACTION_CANCEL
event to the SeekBar for volume. Be sure that we don't try to mess
with something that's already gone by that point.

Change-Id: I4f6119718fc21204d9013d591bc984b785b698b4

diff --git a/core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java b/core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java
index 2da8bf1..f010d7b 100644 (file)
--- a/core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java
+++ b/core/java/com/android/internal/app/MediaRouteChooserDialogFragment.java
@@ -122,6 +122,8 @@ public class MediaRouteChooserDialogFragment extends DialogFragment {
     }
 
     void updateVolume() {
+        if (mRouter == null) return;
+
         final RouteInfo selectedRoute = mRouter.getSelectedRoute(mRouteTypes);
         mVolumeIcon.setImageResource(
                 selectedRoute.getPlaybackType() == RouteInfo.PLAYBACK_TYPE_LOCAL ?