Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modify getting of primary storage size"

Browse Source 
am: 1c876b73b3

Change-Id: I94a26e80a75f03278a8e90d9ec2e4ca0cfbf0a81
This commit is contained in:
hj.seo
2018-01-03 01:22:40 +00:00
committed by android-build-merger
parent 2f928350db 1c876b73b3
commit f8adea8255
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/os/storage/StorageManager.java
View File

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