Sanity check while updating volume in MediaRouteChooserDialog

adamp · adamp · commit 1b4ea7eff505 · 2012-06-22T20:41:31.000-07:00
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
@@ -122,6 +122,8 @@ public void setRouteTypes(int types) {
     }
 
     void updateVolume() {
+        if (mRouter == null) return;
+
         final RouteInfo selectedRoute = mRouter.getSelectedRoute(mRouteTypes);
         mVolumeIcon.setImageResource(
                 selectedRoute.getPlaybackType() == RouteInfo.PLAYBACK_TYPE_LOCAL ?

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,8 @@ public void setRouteTypes(int types) {`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`void updateVolume() {`
	`125`	`+ if (mRouter == null) return;`
	`126`	`+`
`125`	`127`	`final RouteInfo selectedRoute = mRouter.getSelectedRoute(mRouteTypes);`
`126`	`128`	`mVolumeIcon.setImageResource(`
`127`	`129`	`selectedRoute.getPlaybackType() == RouteInfo.PLAYBACK_TYPE_LOCAL ?`