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

Update a couple of blobstore params to be configurable.

Browse Source 
Instead of hardcoding values for IDLE_JOB_PERIOD_MS and
SESSION_EXPIRY_TIMEOUT_MS, make them configurable.

Bug: 157503601
Test: atest --test-mapping apex/blobstore
Change-Id: I4846a98144224873444d4d73b2bedde258992ac4
This commit is contained in:
Sudheer Shanka
2020-05-25 15:40:21 -07:00
parent d8d0efefe7
commit 90ac4a69db
6 changed files with 76 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/BlobStoreTestUtils/Android.bp
View File

@@ -15,6 +15,9 @@
java_library {
name: "BlobStoreTestUtils",
srcs: ["src/**/*.java"],
static_libs: ["truth-prebuilt"],
static_libs: [
"truth-prebuilt",
"androidx.test.uiautomator_uiautomator",
],
sdk_version: "test_current",
}

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

@@ -18,12 +18,16 @@ package com.android.utils.blob;
import static com.google.common.truth.Truth.assertThat;
import android.app.Instrumentation;
import android.app.blob.BlobHandle;
import android.app.blob.BlobStoreManager;
import android.app.blob.LeaseInfo;
import android.content.Context;
import android.content.res.Resources;
import android.os.ParcelFileDescriptor;
import android.util.Log;
import androidx.test.uiautomator.UiDevice;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -32,6 +36,8 @@ import java.io.InputStream;
import java.io.OutputStream;
public class Utils {
public static final String TAG = "BlobStoreTest";
public static final int BUFFER_SIZE_BYTES = 16 * 1024;
public static final long KB_IN_BYTES = 1000;
@@ -68,7 +74,8 @@ public class Utils {
public static void assertLeasedBlobs(BlobStoreManager blobStoreManager,
BlobHandle... expectedBlobHandles) throws IOException {
assertThat(blobStoreManager.getLeasedBlobs()).containsExactly(expectedBlobHandles);
assertThat(blobStoreManager.getLeasedBlobs()).containsExactly(
(Object[]) expectedBlobHandles);
}
public static void assertNoLeasedBlobs(BlobStoreManager blobStoreManager)
@@ -141,4 +148,16 @@ public class Utils {
assertThat(leaseInfo.getDescriptionResId()).isEqualTo(descriptionResId);
assertThat(leaseInfo.getDescription()).isEqualTo(description);
}
public static void triggerIdleMaintenance(Instrumentation instrumentation) throws IOException {
runShellCmd(instrumentation, "cmd blob_store idle-maintenance");
}
private static String runShellCmd(Instrumentation instrumentation,
String cmd) throws IOException {
final UiDevice uiDevice = UiDevice.getInstance(instrumentation);
final String result = uiDevice.executeShellCommand(cmd);
Log.i(TAG, "Output of '" + cmd + "': '" + result + "'");
return result;
}
}