diff options
| author | Craig Mautner <cmautner@google.com> | 2012-11-13 10:04:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-13 10:04:27 -0800 |
| commit | 50acd73173e5ca68db0a4cc01e75a2faef86b2fb (patch) | |
| tree | 8fe38b1c279560ad3893b8d0ecd2e4714a3cf59f /media | |
| parent | 8a96ab8f312a24d7debaa5eae8d904599bb4a7a3 (diff) | |
| parent | 67a3fb6f3b787f0151c7f76f0c19dd1c8b80ae4e (diff) | |
| download | frameworks_base-50acd73173e5ca68db0a4cc01e75a2faef86b2fb.zip frameworks_base-50acd73173e5ca68db0a4cc01e75a2faef86b2fb.tar.gz frameworks_base-50acd73173e5ca68db0a4cc01e75a2faef86b2fb.tar.bz2 | |
am 67a3fb6f: am c10914ca: Merge "Support Wifi display devices that rename themselves." into jb-mr1.1-dev
* commit '67a3fb6f3b787f0151c7f76f0c19dd1c8b80ae4e':
Support Wifi display devices that rename themselves.
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaRouter.java | 2 |
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; } } |