Merge pull request #1793 from crankycoder/features/api_17_timestamps

put an API 17 guard around grabbing the age for wifi signals
mozilla · May 11, 2016 · 3fcf26a · 3fcf26a
2 parents c22bd17 + c8e01e0
commit 3fcf26a
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/...main/java/org/mozilla/mozstumbler/service/stumblerthread/datahandling/StumblerBundle.java b/...main/java/org/mozilla/mozstumbler/service/stumblerthread/datahandling/StumblerBundle.java
@@ -125,8 +125,12 @@ public MLSJSONObject toMLSGeosubmit() throws JSONException {
 
         if (mWifiData.size() > 0) {
             JSONArray wifis = new JSONArray();
+            long gpsTimeSinceBootInMS = 0;
+
+            if (Build.VERSION.SDK_INT >= 17) {
+                gpsTimeSinceBootInMS = (mGpsPosition.getElapsedRealtimeNanos() / 1000000);
+            }
 
-            long gpsTimeSinceBootInMS = (mGpsPosition.getElapsedRealtimeNanos()/1000000);
             for (ScanResult scanResult : mWifiData.values()) {
                 JSONObject wifiEntry = new JSONObject();
                 wifiEntry.put("macAddress", scanResult.BSSID);
@@ -137,9 +141,12 @@ public MLSJSONObject toMLSGeosubmit() throws JSONException {
                     wifiEntry.put("signalStrength", scanResult.level);
                 }
 
-                long wifiTimeSinceBootInMS = (scanResult.timestamp / 1000);
-                long ageMS =  wifiTimeSinceBootInMS - gpsTimeSinceBootInMS;
-                wifiEntry.put("age", ageMS);
+                if (Build.VERSION.SDK_INT >= 17) {
+                    long wifiTimeSinceBootInMS = (scanResult.timestamp / 1000);
+                    long ageMS =  wifiTimeSinceBootInMS - gpsTimeSinceBootInMS;
+                    wifiEntry.put("age", ageMS);
+                }
+
                 wifis.put(wifiEntry);
             }
             headerFields.put(DataStorageConstants.ReportsColumns.WIFI, wifis);