Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13d875fb authored by Daniel Nishi's avatar Daniel Nishi
Browse files

Fix a cache calculation regression.

Cache size was being double-counted for apps in their drilldown.

Change-Id: I44ec03470050dfbce392348c3336dd5e9bb54c36
Fixes: 67028136
Test: SettingsLib integ tests
parent bbdc422b
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ public class StorageStatsSource {
        }

        public long getTotalBytes() {
            return mStats.getCacheBytes() + mStats.getCodeBytes() + mStats.getDataBytes();
            return mStats.getAppBytes() + mStats.getDataBytes();
        }
    }
}
 No newline at end of file
+41 −0
Original line number Diff line number Diff line
/*
 * Copyright (C) 2017 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.android.settingslib.applications;

import static com.google.common.truth.Truth.assertThat;

import android.app.usage.StorageStats;

import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public class StorageStatsSourceTest {
    @Test
    public void AppStorageStatsImpl_totalCorrectly() {
        StorageStats storageStats = new StorageStats();
        storageStats.cacheBytes = 1;
        storageStats.codeBytes = 10;
        storageStats.dataBytes = 100;
        StorageStatsSource.AppStorageStatsImpl stats = new StorageStatsSource.AppStorageStatsImpl(
                storageStats);

        // Note that this does not double add the cache (111).
        assertThat(stats.getTotalBytes()).isEqualTo(110);
    }
}