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

Merge "Update language to comply with Android’s inclusive language guidance." am: 569a4f746e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6bd17f611f77464cc2567ee431e9309fdf12a6d2
This commit is contained in:
Sudheer Shanka
2021-01-13 20:16:27 +00:00
committed by Automerger Merge Worker
parent f26a5b003b 569a4f746e
commit 7e2c5975c5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apct-tests/perftests/blobstore/src/com/android/perftests/blob/BlobStorePerfTests.java
View File

@@ -27,7 +27,7 @@ import android.support.test.uiautomator.UiDevice;
import androidx.test.filters.LargeTest; import androidx.test.filters.LargeTest;
import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.platform.app.InstrumentationRegistry;
import com.android.utils.blob.DummyBlobData; import com.android.utils.blob.FakeBlobData;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@@ -96,7 +96,7 @@ public class BlobStorePerfTests {
mAtraceUtils.startTrace(ATRACE_CATEGORY_SYSTEM_SERVER); mAtraceUtils.startTrace(ATRACE_CATEGORY_SYSTEM_SERVER);
try { try {
final List<Long> durations = new ArrayList<>(); final List<Long> durations = new ArrayList<>();
final DummyBlobData blobData = prepareDataBlob(fileSizeInMb); final FakeBlobData blobData = prepareDataBlob(fileSizeInMb);
final TraceMarkParser parser = new TraceMarkParser( final TraceMarkParser parser = new TraceMarkParser(
line -> line.name.startsWith(ATRACE_COMPUTE_DIGEST_PREFIX)); line -> line.name.startsWith(ATRACE_COMPUTE_DIGEST_PREFIX));
while (mState.keepRunning(durations)) { while (mState.keepRunning(durations)) {
@@ -120,15 +120,15 @@ public class BlobStorePerfTests {
}); });
} }
private DummyBlobData prepareDataBlob(int fileSizeInMb) throws Exception { private FakeBlobData prepareDataBlob(int fileSizeInMb) throws Exception {
final DummyBlobData blobData = new DummyBlobData.Builder(mContext) final FakeBlobData blobData = new FakeBlobData.Builder(mContext)
.setFileSize(fileSizeInMb * 1024 * 1024 /* bytes */) .setFileSize(fileSizeInMb * 1024 * 1024 /* bytes */)
.build(); .build();
blobData.prepare(); blobData.prepare();
return blobData; return blobData;
} }
private void commitBlob(DummyBlobData blobData) throws Exception { private void commitBlob(FakeBlobData blobData) throws Exception {
final long sessionId = mBlobStoreManager.createSession(blobData.getBlobHandle()); final long sessionId = mBlobStoreManager.createSession(blobData.getBlobHandle());
try (BlobStoreManager.Session session = mBlobStoreManager.openSession(sessionId)) { try (BlobStoreManager.Session session = mBlobStoreManager.openSession(sessionId)) {
blobData.writeToSession(session); blobData.writeToSession(session);

8
tests/BlobStoreTestUtils/src/com/android/utils/blob/DummyBlobData.java → tests/BlobStoreTestUtils/src/com/android/utils/blob/FakeBlobData.java
View File

@@ -35,7 +35,7 @@ import java.security.MessageDigest;
import java.util.Random; import java.util.Random;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
public class DummyBlobData { public class FakeBlobData {
private static final long DEFAULT_SIZE_BYTES = 10 * 1024L * 1024L; private static final long DEFAULT_SIZE_BYTES = 10 * 1024L * 1024L;
private final Random mRandom; private final Random mRandom;
@@ -47,7 +47,7 @@ public class DummyBlobData {
byte[] mFileDigest; byte[] mFileDigest;
long mExpiryTimeMs; long mExpiryTimeMs;
private DummyBlobData(Builder builder) { private FakeBlobData(Builder builder) {
mRandom = new Random(builder.getRandomSeed()); mRandom = new Random(builder.getRandomSeed());
mFile = new File(builder.getContext().getFilesDir(), builder.getFileName()); mFile = new File(builder.getContext().getFilesDir(), builder.getFileName());
mFileSize = builder.getFileSize(); mFileSize = builder.getFileSize();
@@ -116,8 +116,8 @@ public class DummyBlobData {
return mExpiryDurationMs; return mExpiryDurationMs;
} }
public DummyBlobData build() { public FakeBlobData build() {
return new DummyBlobData(this); return new FakeBlobData(this);
} }
} }