Merge "Modify getting of primary storage size"

This commit is contained in:
Treehugger Robot
2018-01-03 01:10:49 +00:00
committed by Gerrit Code Review

View File

@@ -1083,12 +1083,14 @@ public class StorageManager {
/** {@hide} */ /** {@hide} */
public static Pair<String, Long> getPrimaryStoragePathAndSize() { public static Pair<String, Long> getPrimaryStoragePathAndSize() {
return Pair.create(null, return Pair.create(null,
FileUtils.roundStorageSize(Environment.getDataDirectory().getTotalSpace())); FileUtils.roundStorageSize(Environment.getDataDirectory().getTotalSpace()
+ Environment.getRootDirectory().getTotalSpace()));
} }
/** {@hide} */ /** {@hide} */
public long getPrimaryStorageSize() { public long getPrimaryStorageSize() {
return FileUtils.roundStorageSize(Environment.getDataDirectory().getTotalSpace()); return FileUtils.roundStorageSize(Environment.getDataDirectory().getTotalSpace()
+ Environment.getRootDirectory().getTotalSpace());
} }
/** @removed */ /** @removed */