am 5b9f8dd7: am 2ebbf4c8: Merge "Special interval value to always run benchmarks." into mnc-dr-dev (a8831ba8) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -368,11 +368,17 @@ class MountService extends IMountService.Stub
	private boolean shouldBenchmark() {		private boolean shouldBenchmark() {
	final long benchInterval = Settings.Global.getLong(mContext.getContentResolver(),		final long benchInterval = Settings.Global.getLong(mContext.getContentResolver(),
	Settings.Global.STORAGE_BENCHMARK_INTERVAL, DateUtils.WEEK_IN_MILLIS);		Settings.Global.STORAGE_BENCHMARK_INTERVAL, DateUtils.WEEK_IN_MILLIS);
			if (benchInterval == -1) {
			return false;
			} else if (benchInterval == 0) {
			return true;
			}

	synchronized (mLock) {		synchronized (mLock) {
	for (int i = 0; i < mVolumes.size(); i++) {		for (int i = 0; i < mVolumes.size(); i++) {
	final VolumeInfo vol = mVolumes.valueAt(i);		final VolumeInfo vol = mVolumes.valueAt(i);
	final VolumeRecord rec = mRecords.get(vol.fsUuid);		final VolumeRecord rec = mRecords.get(vol.fsUuid);
	if (vol.isMountedReadable() && rec != null) {		if (vol.isMountedWritable() && rec != null) {
	final long benchAge = System.currentTimeMillis() - rec.lastBenchMillis;		final long benchAge = System.currentTimeMillis() - rec.lastBenchMillis;
	if (benchAge >= benchInterval) {		if (benchAge >= benchInterval) {
	return true;		return true;