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

Commit 4ae07442 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

Change-Id: I860a840d23cd91f5fdbdfc6f0c35dc20726dc559
parents 88210150 bfa8b3d5
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.