commit 242b255caba1d6fdd651e32fffa68e0dbeb9b65b
author Dongwon Kang <dwkang@google.com> Mon Nov 09 20:29:09 2015 -0800
committer Dongwon Kang <dwkang@google.com> Tue Nov 10 10:06:01 2015 -0800
tree 523c84a3d55bb9412e21c4fcb225c96a190df2a3
parent 18341cb11f490d25a22dd2ff1c79a562531c0e6f

MediaRouter: Dismiss the controller dialog only when a pending intent is set

Bug: 25602234
Change-Id: I5aae65632ac8334b627a6015e436adec0fd60a5a

v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java

diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
index 537b382..e9697e3 100644
--- a/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
+++ b/v7/mediarouter/src/android/support/v7/app/MediaRouteControllerDialog.java
@@ -319,12 +319,12 @@
                     if (pi != null) {
                         try {
                             pi.send();
+                            dismiss();
                         } catch (PendingIntent.CanceledException e) {
                             Log.e(TAG, pi + " was not sent, it had been canceled.");
                         }
                     }
                 }
-                dismiss();
             }
         };
         mArtView = (ImageView) findViewById(R.id.mr_art);