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

Merge "Finish the GZIPOutputStream after copying the data into it"

Browse Source
This commit is contained in:
Jing Ji
2021-01-19 22:47:18 +00:00
committed by Android (Google) Code Review
parent e857186c7d 2c083c8bda
commit e5cd09032b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/DropBoxManagerService.java
View File

@@ -73,7 +73,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.SortedSet;
@@ -446,7 +445,10 @@ public final class DropBoxManagerService extends SystemService {
// from an in-memory buffer, or another file on disk; if we buffered
// we'd lose out on sendfile() optimizations
if (forceCompress) {
FileUtils.copy(in, new GZIPOutputStream(new FileOutputStream(fd)));
final GZIPOutputStream gzipOutputStream =
new GZIPOutputStream(new FileOutputStream(fd));
FileUtils.copy(in, gzipOutputStream);
gzipOutputStream.finish();
} else {
FileUtils.copy(in, new FileOutputStream(fd));
}