summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2013-11-21 23:00:23 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-21 23:00:23 -0800
commit2ab3ec21c0d0b13533434cacf72cc1bc0c81bb32 (patch)
tree23ebd075131bffc6f90d95cb3d6d2143dbe1a07a /packages
parent816fe75304f683e044b46aaf135159c0c2e11e21 (diff)
parent2458681b3ea4571d2f1254ef597475fe6a582907 (diff)
downloadframeworks_base-2ab3ec21c0d0b13533434cacf72cc1bc0c81bb32.zip
frameworks_base-2ab3ec21c0d0b13533434cacf72cc1bc0c81bb32.tar.gz
frameworks_base-2ab3ec21c0d0b13533434cacf72cc1bc0c81bb32.tar.bz2
am 2458681b: am 263c4310: am ce468a35: Stop wifi display discovery when no longer needed.
* commit '2458681b3ea4571d2f1254ef597475fe6a582907': Stop wifi display discovery when no longer needed.
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java10
1 files changed, 2 insertions, 8 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
index 4012ad8..12e08d0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
@@ -813,14 +813,8 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
} else {
connectedRoute = null;
connecting = false;
- final int count = mMediaRouter.getRouteCount();
- for (int i = 0; i < count; i++) {
- MediaRouter.RouteInfo route = mMediaRouter.getRouteAt(i);
- if (route.matchesTypes(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY)) {
- enabled = true;
- break;
- }
- }
+ enabled = mMediaRouter.isRouteAvailable(MediaRouter.ROUTE_TYPE_REMOTE_DISPLAY,
+ MediaRouter.AVAILABILITY_FLAG_IGNORE_DEFAULT_ROUTE);
}
mRemoteDisplayState.enabled = enabled;