Merge "[Wifi connected score] Update values after reset"
diff --git a/service/java/com/android/server/wifi/VelocityBasedConnectedScore.java b/service/java/com/android/server/wifi/VelocityBasedConnectedScore.java
index 38fd1ef..bfc51f6 100644
--- a/service/java/com/android/server/wifi/VelocityBasedConnectedScore.java
+++ b/service/java/com/android/server/wifi/VelocityBasedConnectedScore.java
@@ -91,15 +91,14 @@
double initialVariance = 9.0 * standardDeviation * standardDeviation;
mFilter.mx = new Matrix(1, new double[]{rssi, 0.0});
mFilter.mP = new Matrix(2, new double[]{initialVariance, 0.0, 0.0, 0.0});
- mLastMillis = millis;
- return;
+ } else {
+ double dt = (millis - mLastMillis) * 0.001;
+ mFilter.mR.put(0, 0, standardDeviation * standardDeviation);
+ setDeltaTimeSeconds(dt);
+ mFilter.predict();
+ mFilter.update(new Matrix(1, new double[]{rssi}));
}
- double dt = (millis - mLastMillis) * 0.001;
- mFilter.mR.put(0, 0, standardDeviation * standardDeviation);
- setDeltaTimeSeconds(dt);
- mFilter.predict();
mLastMillis = millis;
- mFilter.update(new Matrix(1, new double[]{rssi}));
mFilteredRssi = mFilter.mx.get(0, 0);
mEstimatedRateOfRssiChange = mFilter.mx.get(1, 0);
}