commit 2ebbf4c899b39e080be1ec9cd5d1178f30c0cd89
author Jeff Sharkey <jsharkey@google.com> Thu Sep 10 00:18:43 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 10 00:18:43 2015 +0000
tree d66431c576e588a737be4902bfa6421f2050092c
parent 16093fe3f0d824731a53a264a132504deb08421a
parent e83d8a993d91ae1c2808008ec688722162157788

Merge "Special interval value to always run benchmarks." into mnc-dr-dev

services/core/java/com/android/server/MountService.java

diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index 0d64540..4e721da 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -368,11 +368,17 @@
     private boolean shouldBenchmark() {
         final long benchInterval = Settings.Global.getLong(mContext.getContentResolver(),
                 Settings.Global.STORAGE_BENCHMARK_INTERVAL, DateUtils.WEEK_IN_MILLIS);
+        if (benchInterval == -1) {
+            return false;
+        } else if (benchInterval == 0) {
+            return true;
+        }
+
         synchronized (mLock) {
             for (int i = 0; i < mVolumes.size(); i++) {
                 final VolumeInfo vol = mVolumes.valueAt(i);
                 final VolumeRecord rec = mRecords.get(vol.fsUuid);
-                if (vol.isMountedReadable() && rec != null) {
+                if (vol.isMountedWritable() && rec != null) {
                     final long benchAge = System.currentTimeMillis() - rec.lastBenchMillis;
                     if (benchAge >= benchInterval) {
                         return true;