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

Merge "Correct the blobstore Session.openWrite() API usage in tests." into rvc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2020-06-22 21:40:50 +00:00
committed by Android (Google) Code Review
parent f4f1079b96 a2c2087f94
commit 74e4018f8b
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/BlobStoreTestUtils/src/com/android/utils/blob/DummyBlobData.java
View File

@@ -153,7 +153,14 @@ public class DummyBlobData {
public void writeToSession(BlobStoreManager.Session session, public void writeToSession(BlobStoreManager.Session session,
long offsetBytes, long lengthBytes) throws Exception { long offsetBytes, long lengthBytes) throws Exception {
try (FileInputStream in = new FileInputStream(mFile)) { try (FileInputStream in = new FileInputStream(mFile)) {
Utils.writeToSession(session, in, offsetBytes, lengthBytes); Utils.writeToSession(session, in, offsetBytes, lengthBytes, lengthBytes);
}
}
public void writeToSession(BlobStoreManager.Session session,
long offsetBytes, long lengthBytes, long allocateBytes) throws Exception {
try (FileInputStream in = new FileInputStream(mFile)) {
Utils.writeToSession(session, in, offsetBytes, lengthBytes, allocateBytes);
} }
} }

6
tests/BlobStoreTestUtils/src/com/android/utils/blob/Utils.java
View File

@@ -59,15 +59,15 @@ public class Utils {
public static void writeToSession(BlobStoreManager.Session session, ParcelFileDescriptor input, public static void writeToSession(BlobStoreManager.Session session, ParcelFileDescriptor input,
long lengthBytes) throws IOException { long lengthBytes) throws IOException {
try (FileInputStream in = new ParcelFileDescriptor.AutoCloseInputStream(input)) { try (FileInputStream in = new ParcelFileDescriptor.AutoCloseInputStream(input)) {
writeToSession(session, in, 0, lengthBytes); writeToSession(session, in, 0, lengthBytes, lengthBytes);
} }
} }
public static void writeToSession(BlobStoreManager.Session session, FileInputStream in, public static void writeToSession(BlobStoreManager.Session session, FileInputStream in,
long offsetBytes, long lengthBytes) throws IOException { long offsetBytes, long lengthBytes, long allocateBytes) throws IOException {
in.getChannel().position(offsetBytes); in.getChannel().position(offsetBytes);
try (FileOutputStream out = new ParcelFileDescriptor.AutoCloseOutputStream( try (FileOutputStream out = new ParcelFileDescriptor.AutoCloseOutputStream(
session.openWrite(offsetBytes, lengthBytes))) { session.openWrite(offsetBytes, allocateBytes))) {
copy(in, out, lengthBytes); copy(in, out, lengthBytes);
} }
} }