| commit | 4244b5c0864478a750e9c15930ccb8ea2f4b2d94 | [log] [tgz] |
|---|---|---|
| author | gitbuildkicker <android-build@google.com> | Mon Oct 17 00:05:45 2016 -0700 |
| committer | gitbuildkicker <android-build@google.com> | Mon Oct 17 00:05:45 2016 -0700 |
| tree | 17111b7ca3c50d547adee453b1f90af8fbfcc2d2 | |
| parent | dffce799b08cbea89247cffc19c8f91bc592ec81 [diff] | |
| parent | 747384a0908e829b17f9f00647f7d6c25f02c2c1 [diff] |
merge in nyc-mr1-release history after reset to nyc-mr1-dev
diff --git a/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java b/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java index 20e83aa..25288c0 100644 --- a/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java +++ b/v7/mediarouter/src/android/support/v7/app/MediaRouteButton.java
@@ -513,6 +513,9 @@ } } } + + setEnabled(mRouter.isRouteAvailable(mSelector, + MediaRouter.AVAILABILITY_FLAG_IGNORE_DEFAULT_ROUTE)); } }