summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2012-11-07 16:02:13 -0800
committerJeff Brown <jeffbrown@google.com>2012-11-07 18:43:32 -0800
commit74da109102864f19b3dcdb30cd1d92c46fb12f2f (patch)
tree831538f1a4c17d10ca06827b8304df62692bf194 /media
parenteb3aa44c10b155f917e8840d55b5bc1de3712ba9 (diff)
downloadframeworks_base-74da109102864f19b3dcdb30cd1d92c46fb12f2f.zip
frameworks_base-74da109102864f19b3dcdb30cd1d92c46fb12f2f.tar.gz
frameworks_base-74da109102864f19b3dcdb30cd1d92c46fb12f2f.tar.bz2
Support Wifi display devices that rename themselves.
Some Wifi display devices like to rename themselves after a connection completes (or at other times). Make sure to update the name of the display when we detect that it changed in our scan results. This problem is somewhat complicated by the fact that we remember the display name persistently, so we need to update our list of remembered displays too. Improve the state machine to avoid redundant attempts to disconnect or cancel connection. Bug: 7478895 Change-Id: I35a9e2c6a8deadbe892dacd5e3b4a5a2b12d6cf0
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaRouter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java
index 2a5a16e..8701f36 100644
--- a/media/java/android/media/MediaRouter.java
+++ b/media/java/android/media/MediaRouter.java
@@ -862,7 +862,7 @@ public class MediaRouter {
private static WifiDisplay findMatchingDisplay(WifiDisplay d, WifiDisplay[] displays) {
for (int i = 0; i < displays.length; i++) {
final WifiDisplay other = displays[i];
- if (d.getDeviceAddress().equals(other.getDeviceAddress())) {
+ if (d.hasSameAddress(other)) {
return other;
}
}