Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 976b9f84 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android’s inclusive language guidance."... 

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25ef621f757b9a838efc118bf4034ce429c5a6b2
parents a9a80c7e 7e2c5975

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

+5 −5
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.support.test.uiautomator.UiDevice; 
import androidx.test.filters.LargeTest;

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.Before;
@@ -96,7 +96,7 @@ public class BlobStorePerfTests { 
        mAtraceUtils.startTrace(ATRACE_CATEGORY_SYSTEM_SERVER);

        try {

            final List<Long> durations = new ArrayList<>();

            final DummyBlobData blobData = prepareDataBlob(fileSizeInMb);

            final FakeBlobData blobData = prepareDataBlob(fileSizeInMb);

            final TraceMarkParser parser = new TraceMarkParser(

                    line -> line.name.startsWith(ATRACE_COMPUTE_DIGEST_PREFIX));

            while (mState.keepRunning(durations)) {
@@ -120,15 +120,15 @@ public class BlobStorePerfTests { 
        });

    }



    private DummyBlobData prepareDataBlob(int fileSizeInMb) throws Exception {

        final DummyBlobData blobData = new DummyBlobData.Builder(mContext)

    private FakeBlobData prepareDataBlob(int fileSizeInMb) throws Exception {

        final FakeBlobData blobData = new FakeBlobData.Builder(mContext)

                .setFileSize(fileSizeInMb * 1024 * 1024 /* bytes */)

                .build();

        blobData.prepare();

        return blobData;

    }



    private void commitBlob(DummyBlobData blobData) throws Exception {

    private void commitBlob(FakeBlobData blobData) throws Exception {

        final long sessionId = mBlobStoreManager.createSession(blobData.getBlobHandle());

        try (BlobStoreManager.Session session = mBlobStoreManager.openSession(sessionId)) {

            blobData.writeToSession(session);

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

+4 −4
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ import java.security.MessageDigest; 
import java.util.Random;

import java.util.concurrent.TimeUnit;



public class DummyBlobData {

public class FakeBlobData {

    private static final long DEFAULT_SIZE_BYTES = 10 * 1024L * 1024L;



    private final Random mRandom;
@@ -47,7 +47,7 @@ public class DummyBlobData { 
    byte[] mFileDigest;

    long mExpiryTimeMs;



    private DummyBlobData(Builder builder) {

    private FakeBlobData(Builder builder) {

        mRandom = new Random(builder.getRandomSeed());

        mFile = new File(builder.getContext().getFilesDir(), builder.getFileName());

        mFileSize = builder.getFileSize();
@@ -116,8 +116,8 @@ public class DummyBlobData { 
            return mExpiryDurationMs;

        }



        public DummyBlobData build() {

            return new DummyBlobData(this);

        public FakeBlobData build() {

            return new FakeBlobData(this);

        }

    }