Changed BenchmarkRule imports with PerfStatusReporter

This change is needed because BenchmarkRule internally creates an
instance of PerfettoCapture, which has a check of stopping any running
perfetto jobs. This leads to a clash with the trace recording started by  Crystal Ball via PerfettoListener, leading to an incomplete output trace

Bug: 257776124
Test: Manual
Change-Id: Ic804a485dff71f74c9d20fd966e0e0d6a04809a7
This commit is contained in:
Rupesh Bansal
2022-11-07 11:37:09 +00:00
parent b77faad0a9
commit 48eb172f23

View File

@@ -18,11 +18,11 @@ package android.os;
import android.content.Context;
import android.hardware.display.DisplayManager;
import android.perftests.utils.BenchmarkState;
import android.perftests.utils.PerfStatusReporter;
import android.provider.Settings;
import android.view.Display;
import androidx.benchmark.BenchmarkState;
import androidx.benchmark.junit4.BenchmarkRule;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;
@@ -38,7 +38,7 @@ public final class DisplayPerfTest {
private static final float DELTA = 0.001f;
@Rule
public final BenchmarkRule mBenchmarkRule = new BenchmarkRule();
public final PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
private DisplayManager mDisplayManager;
private Context mContext;
@@ -51,7 +51,7 @@ public final class DisplayPerfTest {
@Test
public void testBrightnessChanges() throws Exception {
final BenchmarkState state = mBenchmarkRule.getState();
final BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.SCREEN_BRIGHTNESS_MODE,
Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);