commit 87ed6199ce67020bf0dc00522101a92100a42d93
author Brian Muramatsu <btmura@android.com> Mon Jan 28 15:57:14 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 28 15:57:14 2013 -0800
tree 1521c61b72887d5b6c661c1f0d83c2cc7fdc1334
parent e78365c96a48e1bc8b51231355b7312e6025671a
parent a0993ab4f1025e1364f5a316db96a7f05c6afeab

am a0993ab4: Merge "Restore CtsVerifier rate for passive updates" into jb-dev

# By Laurent Tu
# Via Gerrit Code Review (1) and Laurent Tu (1)
* commit 'a0993ab4f1025e1364f5a316db96a7f05c6afeab':
  Restore CtsVerifier rate for passive updates

apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java b/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java
index b6d2a9e..3315ba3 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/location/LocationVerifier.java
@@ -35,9 +35,13 @@
     /** Timing failures on first NUM_IGNORED_UPDATES updates are ignored. */
     private static final int NUM_IGNORED_UPDATES = 2;
 
-    /* The mean computed for the deltas should not be smaller
-     * than mInterval * MIN_MEAN_RATIO */
-    private static final double MIN_MEAN_RATIO = 0.75;
+    /* In active mode, the mean computed for the deltas should not be smaller
+     * than mInterval * ACTIVE_MIN_MEAN_RATIO */
+    private static final double ACTIVE_MIN_MEAN_RATIO = 0.75;
+
+    /* In passive mode, the mean computed for the deltas should not be smaller
+     * than mInterval * PASSIVE_MIN_MEAN_RATIO */
+    private static final double PASSIVE_MIN_MEAN_RATIO = 0.1;
 
     /**
      * The standard deviation computed for the deltas should not be bigger
@@ -90,8 +94,8 @@
             mCb.log("active " + mProvider + " update (" + delta + "ms)");
 
             if (mNumActiveUpdates >= mRequestedUpdates) {
-                assertMeanAndStdev(mProvider, mActiveDeltas);
-                assertMeanAndStdev(LocationManager.PASSIVE_PROVIDER, mPassiveDeltas);
+                assertMeanAndStdev(mProvider, mActiveDeltas, ACTIVE_MIN_MEAN_RATIO);
+                assertMeanAndStdev(LocationManager.PASSIVE_PROVIDER, mPassiveDeltas, PASSIVE_MIN_MEAN_RATIO);
                 pass();
             }
         }
@@ -104,11 +108,11 @@
         public void onProviderDisabled(String provider) { }
     }
 
-    private void assertMeanAndStdev(String provider, List<Long> deltas) {
+    private void assertMeanAndStdev(String provider, List<Long> deltas, double minMeanRatio) {
         double mean = computeMean(deltas);
         double stdev = computeStdev(mean, deltas);
 
-        double minMean = mInterval * MIN_MEAN_RATIO;
+        double minMean = mInterval * minMeanRatio;
         if (mean < minMean) {
             fail(provider + " provider mean too small: " + mean
                  + " (min: " + minMean + ")");