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

Commit 7035a417 authored by Daniel Nishi's avatar Daniel Nishi Committed by Android (Google) Code Review
Browse files

Merge "Fix a bug where cache was double-counted." into oc-dev

parents 98b67a4e 6f92b661

src/com/android/settings/applications/AppStorageSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -543,8 +543,8 @@ public class AppStorageSettings extends AppInfoWithHeader 
            mClearCacheButton.setEnabled(false);

        } else {

            long codeSize = result.getCodeBytes();

            long dataSize = result.getDataBytes();

            long cacheSize = result.getCacheBytes();

            long dataSize = result.getDataBytes() - cacheSize;



            if (dataSize <= 0 || !mCanClearData || mDataCleared) {

                mClearDataButton.setEnabled(false);

src/com/android/settings/applications/AppStorageSizesController.java

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ public class AppStorageSizesController { 
            mTotalSize.setSummary(errorRes);

        } else {

            long codeSize = mLastResult.getCodeBytes();

            long dataSize = mDataCleared ? 0 : mLastResult.getDataBytes();

            long dataSize =

                    mDataCleared ? 0 : mLastResult.getDataBytes() - mLastResult.getCacheBytes();

            if (mLastCodeSize != codeSize) {

                mLastCodeSize = codeSize;

                mAppSize.setSummary(getSizeStr(context, codeSize));

tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java

+7 −9
Original line number Diff line number Diff line
@@ -14,11 +14,9 @@ import com.android.settings.TestConfig; 
import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowApplication;



import com.android.settings.R;

import com.android.settingslib.applications.StorageStatsSource.AppStorageStats;
@@ -82,15 +80,15 @@ public class AppStorageSizesControllerTest { 
        when(result.getCodeBytes()).thenReturn(1L);

        when(result.getCacheBytes()).thenReturn(10L);

        when(result.getDataBytes()).thenReturn(100L);

        when(result.getTotalBytes()).thenReturn(111L);

        when(result.getTotalBytes()).thenReturn(101L);



        mController.setResult(result);

        mController.updateUi(mContext);



        assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");

        assertThat(mCachePreference.getSummary()).isEqualTo("10.00B");

        assertThat(mDataPreference.getSummary()).isEqualTo("100B");

        assertThat(mTotalPreference.getSummary()).isEqualTo("111B");

        assertThat(mDataPreference.getSummary()).isEqualTo("90.00B");

        assertThat(mTotalPreference.getSummary()).isEqualTo("101B");

    }



    @Test
@@ -99,7 +97,7 @@ public class AppStorageSizesControllerTest { 
        when(result.getCodeBytes()).thenReturn(1L);

        when(result.getCacheBytes()).thenReturn(10L);

        when(result.getDataBytes()).thenReturn(100L);

        when(result.getTotalBytes()).thenReturn(111L);

        when(result.getTotalBytes()).thenReturn(101L);



        mController.setResult(result);

        mController.setCacheCleared(true);
@@ -107,8 +105,8 @@ public class AppStorageSizesControllerTest { 


        assertThat(mAppPreference.getSummary()).isEqualTo("1.00B");

        assertThat(mCachePreference.getSummary()).isEqualTo("0.00B");

        assertThat(mDataPreference.getSummary()).isEqualTo("100B");

        assertThat(mTotalPreference.getSummary()).isEqualTo("101B");

        assertThat(mDataPreference.getSummary()).isEqualTo("90.00B");

        assertThat(mTotalPreference.getSummary()).isEqualTo("91.00B");

    }



    @Test
@@ -117,7 +115,7 @@ public class AppStorageSizesControllerTest { 
        when(result.getCodeBytes()).thenReturn(1L);

        when(result.getCacheBytes()).thenReturn(10L);

        when(result.getDataBytes()).thenReturn(100L);

        when(result.getTotalBytes()).thenReturn(111L);

        when(result.getTotalBytes()).thenReturn(101L);



        mController.setResult(result);

        mController.setDataCleared(true);