Merge "DropBoxManager: use BufferedInputStream when using GZIPInputStream" am: 92889d10fe am: afeee6a12b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1786608

Change-Id: I23ff5312e8e3f42415b744fbd9184d5e42646a3c
This commit is contained in:
Tom Cherry
2021-08-05 22:24:21 +00:00
committed by Automerger Merge Worker

View File

@@ -34,6 +34,7 @@ import android.util.Log;
import com.android.internal.os.IDropBoxManagerService; import com.android.internal.os.IDropBoxManagerService;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.Closeable; import java.io.Closeable;
import java.io.File; import java.io.File;
@@ -257,7 +258,8 @@ public class DropBoxManager {
} else { } else {
return null; return null;
} }
return (mFlags & IS_GZIPPED) != 0 ? new GZIPInputStream(is) : is; return (mFlags & IS_GZIPPED) != 0
? new GZIPInputStream(new BufferedInputStream(is)) : is;
} }
public static final @android.annotation.NonNull Parcelable.Creator<Entry> CREATOR = new Parcelable.Creator() { public static final @android.annotation.NonNull Parcelable.Creator<Entry> CREATOR = new Parcelable.Creator() {