PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix incorrect storage size in Storage Settings" into sc-dev

Browse Source
This commit is contained in:
Arc Wang
2021-07-02 10:05:16 +00:00
committed by Android (Google) Code Review
parent 14a31ce9d6 25880d0d0e
commit 68caefba32
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -386,8 +386,6 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
+ otherData.documentsAndOtherSize + otherData.documentsAndOtherSize
+ otherData.trashSize + otherData.trashSize
+ otherData.allAppsExceptGamesSize; + otherData.allAppsExceptGamesSize;
attributedSize += otherData.externalStats.totalBytes
- otherData.externalStats.appBytes;
attributedSize -= otherData.duplicateCodeSize; attributedSize -= otherData.duplicateCodeSize;
} }

7
tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
View File

@@ -54,7 +54,6 @@ import com.android.settings.applications.manageapplications.ManageApplications;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment; import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
import com.android.settings.deviceinfo.StorageItemPreference; import com.android.settings.deviceinfo.StorageItemPreference;
import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settingslib.applications.StorageStatsSource;
import com.android.settingslib.deviceinfo.StorageVolumeProvider; import com.android.settingslib.deviceinfo.StorageVolumeProvider;
import org.junit.Before; import org.junit.Before;
@@ -340,12 +339,6 @@ public class StorageItemPreferenceControllerTest {
result.documentsAndOtherSize = MEGABYTE_IN_BYTES * 50; result.documentsAndOtherSize = MEGABYTE_IN_BYTES * 50;
result.trashSize = KILOBYTE_IN_BYTES * 100; result.trashSize = KILOBYTE_IN_BYTES * 100;
result.allAppsExceptGamesSize = MEGABYTE_IN_BYTES * 90; result.allAppsExceptGamesSize = MEGABYTE_IN_BYTES * 90;
result.externalStats =
new StorageStatsSource.ExternalStorageStats(
MEGABYTE_IN_BYTES * 500, // total
MEGABYTE_IN_BYTES * 100, // audio
MEGABYTE_IN_BYTES * 150, // video
MEGABYTE_IN_BYTES * 200, 0); // image
final SparseArray<StorageAsyncLoader.StorageResult> results = new SparseArray<>(); final SparseArray<StorageAsyncLoader.StorageResult> results = new SparseArray<>();
results.put(0, result); results.put(0, result);