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

Merge "Fix an NPE when FileCollector runs." into oc-dev

Browse Source
This commit is contained in:
Daniel Nishi
2017-06-01 17:29:54 +00:00
committed by Android (Google) Code Review
parent 689f41e871 e4bea2d769
commit bfa8b3d542
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/storage/FileCollector.java
View File

@@ -203,7 +203,13 @@ public class FileCollector {
return 0; return 0;
} }
final long sharedDataSize = shared.getPath().getTotalSpace(); // In some cases, the path may be null -- we can't determine the size in this case.
final File sharedPath = shared.getPath();
if (sharedPath == null) {
return 0;
}
final long sharedDataSize = sharedPath.getTotalSpace();
long systemSize = sm.getPrimaryStorageSize() - sharedDataSize; long systemSize = sm.getPrimaryStorageSize() - sharedDataSize;
// This case is not exceptional -- we just fallback to the shared data volume in this case. // This case is not exceptional -- we just fallback to the shared data volume in this case.