From 25880d0d0e10e376fcca219fe9c69a4cc0dbeed8 Mon Sep 17 00:00:00 2001
From: Arc Wang <arcwang@google.com>
Date: Fri, 2 Jul 2021 10:39:25 +0800
Subject: [PATCH] Fix incorrect storage size in Storage Settings

From Android S, Storage Settings queries file sizes
from MediaProvider, it's not necessary to count size
data from getExternalStorageStats when calculating
size data.

Bug: 185542752
Test: make RunSettingsRoboTests ROBOTEST_FILTER=testMeasurementCompletedUpdatesPreferences
      manual
      1. Connect device to PC via USB File transfer.
      2. Copy large files from PC to device.
      3. Observe size information in Storage Settings.
Change-Id: I43cbec764e97f5003a4ec981717c9f213a21b614
---
 .../storage/StorageItemPreferenceController.java           | 2 --
 .../storage/StorageItemPreferenceControllerTest.java       | 7 -------
 2 files changed, 9 deletions(-)

diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index 22ea98fda3e..fd9ae8c5d8f 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -386,8 +386,6 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
                                 + otherData.documentsAndOtherSize
                                 + otherData.trashSize
                                 + otherData.allAppsExceptGamesSize;
-                attributedSize += otherData.externalStats.totalBytes
-                        - otherData.externalStats.appBytes;
                 attributedSize -= otherData.duplicateCodeSize;
             }
 
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
index 3eab600d841..5fcb9c1e8ef 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -54,7 +54,6 @@ import com.android.settings.applications.manageapplications.ManageApplications;
 import com.android.settings.dashboard.profileselector.ProfileSelectFragment;
 import com.android.settings.deviceinfo.StorageItemPreference;
 import com.android.settings.testutils.shadow.ShadowUserManager;
-import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
 import org.junit.Before;
@@ -340,12 +339,6 @@ public class StorageItemPreferenceControllerTest {
         result.documentsAndOtherSize = MEGABYTE_IN_BYTES * 50;
         result.trashSize = KILOBYTE_IN_BYTES * 100;
         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<>();
         results.put(0, result);