| Index: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
|
| index ad1c382ecba0c36968f083c10f8d03afd211273b..2783b9cbdcf64276bac92ef4cf9cad7df62058c5 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java
|
| @@ -490,7 +490,12 @@ class UrlManager {
|
| } else {
|
| mUrlsSortedByTimestamp.remove(urlInfo.getUrl());
|
| currentUrlInfo.setScanTimestamp(urlInfo.getScanTimestamp());
|
| - currentUrlInfo.setDistance(urlInfo.getDistance());
|
| + if (urlInfo.getDistance() > 0.0) {
|
| + currentUrlInfo.setDistance(urlInfo.getDistance());
|
| + }
|
| + if (urlInfo.getDeviceAddress() != null) {
|
| + currentUrlInfo.setDeviceAddress(urlInfo.getDeviceAddress());
|
| + }
|
| }
|
| mUrlsSortedByTimestamp.add(urlInfo.getUrl());
|
| return currentUrlInfo;
|
|
|