Revert "SystemUI: Check whether the selected WFD route is available"
This reverts commit ebf461395d1150b9a4917f746b05400430539aa0.
Prepare a15 QPR1
Change-Id: I4693412b383c901af5ebacf6e085b57ca1931d4f
diff --git a/core/java/com/android/internal/app/MediaRouteDialogPresenter.java b/core/java/com/android/internal/app/MediaRouteDialogPresenter.java
index b19656e..5628b7e 100644
--- a/core/java/com/android/internal/app/MediaRouteDialogPresenter.java
+++ b/core/java/com/android/internal/app/MediaRouteDialogPresenter.java
@@ -89,8 +89,7 @@
final MediaRouter router = context.getSystemService(MediaRouter.class);
MediaRouter.RouteInfo route = router.getSelectedRoute();
- if (route.isDefault() || !route.matchesTypes(routeTypes)
- || route.getStatusCode() == MediaRouter.RouteInfo.STATUS_NOT_AVAILABLE) {
+ if (route.isDefault() || !route.matchesTypes(routeTypes)) {
final MediaRouteChooserDialog d = new MediaRouteChooserDialog(context, theme,
showProgressBarWhenEmpty);
d.setRouteTypes(routeTypes);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java
index d13779a..2f2e283 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java
@@ -166,8 +166,7 @@
int statusCode = route.getStatusCode();
if (statusCode == RouteInfo.STATUS_CONNECTING) {
device.state = CastDevice.STATE_CONNECTING;
- } else if (route.isSelected() && statusCode != RouteInfo.STATUS_NOT_AVAILABLE
- || statusCode == RouteInfo.STATUS_CONNECTED) {
+ } else if (route.isSelected() || statusCode == RouteInfo.STATUS_CONNECTED) {
device.state = CastDevice.STATE_CONNECTED;
} else {
device.state = CastDevice.STATE_DISCONNECTED;