Merge "Update the API usage to get total size of devices" into udc-qpr-dev am: 1bc145ab6b am: 595db29382

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24434307

Change-Id: I276e74bc1534ec9253b886ceaf29dc5710a011fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/Utils.java

@@ -63,7 +63,6 @@ import android.os.BatteryManager;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Environment;
 import android.os.IBinder;
 import android.os.INetworkManagementService;
 import android.os.RemoteException;
@@ -1330,14 +1329,4 @@ public final class Utils extends com.android.settingslib.Utils {
         return dreamsSupported && (!dreamsOnlyEnabledForDockUser || canCurrentUserDream(context));
     }
 
-    /**
-     * Get private total size directly.
-     * Referred from StorageManager
-     */
-    public static long getPrimaryStorageSize() {
-        // TODO(b/288103116): remove this method once support by StorageManager.
-        return Environment.getDataDirectory().getTotalSpace()
-                + Environment.getRootDirectory().getTotalSpace();
-    }
-
 }