Skip to content

Make getAvailableSpace return available space instead of max requested space #773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Make getAvailableSpace return available space instead of max requested space #773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions services/src/main/java/io/opentelemetry/android/internal/services/CacheStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,12 @@ private long getAvailableSpace(File directory, long maxSpaceNeeded) {
try {
StorageManager storageManager = appContext.getSystemService(StorageManager.class);
UUID appSpecificInternalDirUuid = storageManager.getUuidForPath(directory);
long availableSpace = storageManager.getAllocatableBytes(appSpecificInternalDirUuid);
// Get the minimum amount of allocatable space.
long spaceToAllocate =
Math.min(
storageManager.getAllocatableBytes(appSpecificInternalDirUuid),
maxSpaceNeeded);
long spaceToAllocate = Math.min(availableSpace, maxSpaceNeeded);
// Ensure the space is available by asking the OS to clear stale cache if needed.
storageManager.allocateBytes(appSpecificInternalDirUuid, spaceToAllocate);
return spaceToAllocate;
return availableSpace;
} catch (IOException e) {
Log.w(RumConstants.OTEL_RUM_LOG_TAG, "Failed to get available space", e);
return getLegacyAvailableSpace(directory, maxSpaceNeeded);
Expand All @@ -80,6 +78,6 @@ private long getLegacyAvailableSpace(File directory, long maxSpaceNeeded) {
String.format(
"Getting legacy available space for %s max needed is: %s",
directory, maxSpaceNeeded));
return Math.min(directory.getUsableSpace(), maxSpaceNeeded);
return directory.getUsableSpace();
}
}