summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2012-11-13 10:00:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-13 10:00:04 -0800
commitc10914ca5c83ad6ac2c9acd7b52bfeb05d6e72e5 (patch)
tree97e8e887d948777edbd2f3e8d537d2e00ebe8b72 /media
parented41bc22814dd86a605569afa422278f716d940a (diff)
parent74da109102864f19b3dcdb30cd1d92c46fb12f2f (diff)
downloadframeworks_base-c10914ca5c83ad6ac2c9acd7b52bfeb05d6e72e5.zip
frameworks_base-c10914ca5c83ad6ac2c9acd7b52bfeb05d6e72e5.tar.gz
frameworks_base-c10914ca5c83ad6ac2c9acd7b52bfeb05d6e72e5.tar.bz2
Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev
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;
}
}