Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2f96a0b authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

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

am: 4ae07442

Change-Id: Ie75d0d87f841827114c48d92faa548367ff9fc68
parents 392205d5 4ae07442
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -203,7 +203,13 @@ public class FileCollector {
            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;

        // This case is not exceptional -- we just fallback to the shared data volume in this case.