Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 1b5ef8bb25d8 (bug 1259598) for bustage

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-04-22 06:57:05 +02:00
parent e56e41f353
commit c5e089ec4e
4 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/Reporter.java
View File

@ -27,7 +27,6 @@ import org.mozilla.mozstumbler.service.stumblerthread.datahandling.StumblerBundl
import org.mozilla.mozstumbler.service.stumblerthread.scanners.cellscanner.CellInfo;
import org.mozilla.mozstumbler.service.stumblerthread.scanners.cellscanner.CellScanner;
import org.mozilla.mozstumbler.service.stumblerthread.scanners.GPSScanner;
import org.mozilla.mozstumbler.service.stumblerthread.scanners.PressureScanner;
import org.mozilla.mozstumbler.service.stumblerthread.scanners.WifiScanner;
public final class Reporter extends BroadcastReceiver {
@ -78,7 +77,6 @@ public final class Reporter extends BroadcastReceiver {
intentFilter.addAction(WifiScanner.ACTION_WIFIS_SCANNED);
intentFilter.addAction(CellScanner.ACTION_CELLS_SCANNED);
intentFilter.addAction(GPSScanner.ACTION_GPS_UPDATED);
intentFilter.addAction(PressureScanner.ACTION_PRESSURE_SCANNED);
intentFilter.addAction(ACTION_FLUSH_TO_BUNDLE);
LocalBroadcastManager.getInstance(mContext).registerReceiver(this,
intentFilter);
@ -115,18 +113,6 @@ public final class Reporter extends BroadcastReceiver {
}
}
private void receivedPressureMessage(Intent intent) {
float hPa = intent.getFloatExtra(PressureScanner.ACTION_PRESSURE_SCANNED_PRESSURE,
(float) 0.0);
if (mBundle == null || hPa == 0.0) {
return;
}
mBundle.addPressure(hPa);
}
@Override
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
@ -145,9 +131,6 @@ public final class Reporter extends BroadcastReceiver {
// Calls reportCollectedLocation, this is the ideal case
receivedGpsMessage(intent);
break;
case PressureScanner.ACTION_PRESSURE_SCANNED:
receivedPressureMessage(intent);
break;
}
if (mBundle != null &&

3
mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/datahandling/DataStorageContract.java
View File

@ -17,9 +17,6 @@ public final class DataStorageContract {
public static final String WIFI = "wifi";
public static final String CELL_COUNT = "cell_count";
public static final String WIFI_COUNT = "wifi_count";
public static final String HEADING = "heading";
public static final String SPEED = "speed";
public static final String PRESSURE = "pressure";
}
public static class Stats {

25
mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/datahandling/StumblerBundle.java
View File

@ -23,8 +23,6 @@ public final class StumblerBundle implements Parcelable {
private final Location mGpsPosition;
private final Map<String, ScanResult> mWifiData;
private final Map<String, CellInfo> mCellData;
private float mPressureHPA;
public void wasSent() {
mGpsPosition.setTime(System.currentTimeMillis());
@ -117,13 +115,6 @@ public final class StumblerBundle implements Parcelable {
item.put(DataStorageContract.ReportsColumns.LAT, Math.floor(mGpsPosition.getLatitude() * 1.0E6) / 1.0E6);
item.put(DataStorageContract.ReportsColumns.LON, Math.floor(mGpsPosition.getLongitude() * 1.0E6) / 1.0E6);
item.put(DataStorageConstants.ReportsColumns.HEADING, mGpsPosition.getBearing());
item.put(DataStorageConstants.ReportsColumns.SPEED, mGpsPosition.getSpeed());
if (mPressureHPA != 0.0) {
item.put(DataStorageConstants.ReportsColumns.PRESSURE, mPressureHPA);
}
if (mGpsPosition.hasAccuracy()) {
item.put(DataStorageContract.ReportsColumns.ACCURACY, (int) Math.ceil(mGpsPosition.getAccuracy()));
}
@ -151,32 +142,16 @@ public final class StumblerBundle implements Parcelable {
item.put(DataStorageContract.ReportsColumns.CELL_COUNT, cellJSON.length());
JSONArray wifis = new JSONArray();
long gpsTimeSinceBootInMS = (mGpsPosition.getElapsedRealtimeNanos()/1000000);
for (ScanResult s : mWifiData.values()) {
JSONObject wifiEntry = new JSONObject();
wifiEntry.put("key", s.BSSID);
wifiEntry.put("frequency", s.frequency);
wifiEntry.put("signal", s.level);
long wifiTimeSinceBootInMS = (s.timestamp / 1000);
long ageMS = wifiTimeSinceBootInMS - gpsTimeSinceBootInMS;
wifiEntry.put("age", ageMS);
wifis.put(wifiEntry);
}
item.put(DataStorageContract.ReportsColumns.WIFI, wifis);
item.put(DataStorageContract.ReportsColumns.WIFI_COUNT, wifis.length());
return item;
}
public void addPressure(float hPa) {
mPressureHPA = hPa;
}
}

5
mobile/android/stumbler/java/org/mozilla/mozstumbler/service/stumblerthread/scanners/ScanManager.java
View File

@ -107,7 +107,6 @@ public class ScanManager {
mGPSScanner = new GPSScanner(context, this);
mWifiScanner = new WifiScanner(context);
mCellScanner = new CellScanner(context);
mPressureScanner = new PressureScanner(context);
}
if (AppGlobals.isDebug) {
@ -118,7 +117,6 @@ public class ScanManager {
if (mStumblingMode == ActiveOrPassiveStumbling.ACTIVE_STUMBLING) {
mWifiScanner.start(mStumblingMode);
mCellScanner.start(mStumblingMode);
mPressureScanner.start();
// in passive mode, these scans are started by passive gps notifications
}
mIsScanning = true;
@ -136,9 +134,6 @@ public class ScanManager {
mGPSScanner.stop();
mWifiScanner.stop();
mCellScanner.stop();
if (mPressureScanner != null) {
mPressureScanner.stop();
}
mIsScanning = false;
return true;