Store device addresses in UrlInfo

chrome/android/java/src/org/chromium/chrome/browser/physicalweb/UrlManager.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.physicalweb;
 
 import android.app.AlarmManager;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ skipping 472 matching lines @@
      * @return The updated cache entry
      */
     private UrlInfo updateCacheEntry(UrlInfo urlInfo) {
         UrlInfo currentUrlInfo = mUrlInfoMap.get(urlInfo.getUrl());
         if (currentUrlInfo == null) {
             mUrlInfoMap.put(urlInfo.getUrl(), urlInfo);
             currentUrlInfo = urlInfo;
         } 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;
     }
 
     private void resolveUrl(final UrlInfo url) {
         Set<UrlInfo> urls = new HashSet<UrlInfo>(Arrays.asList(url));
         final long timestamp = SystemClock.elapsedRealtime();
         mPwsClient.resolve(urls, new PwsClient.ResolveScanCallback() {
             @Override
@@ skipping 320 matching lines @@
 
     private native long nativeInit();
     private native void nativeAppendMetadataItem(long nativePhysicalWebCollection,
             String requestUrl, double distanceEstimate, int scanTimestamp, String siteUrl,
             String iconUrl, String title, String description, String groupId);
     private native void nativeOnFound(long nativePhysicalWebDataSourceAndroid, String url);
     private native void nativeOnLost(long nativePhysicalWebDataSourceAndroid, String url);
     private native void nativeOnDistanceChanged(
             long nativePhysicalWebDataSourceAndroid, String url, double distanceChanged);
 }