Merge "Camera2: fix the performance test issue for some front camera" into lmp-dev
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/PerformanceTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/PerformanceTest.java
index 88d2211..81152a0 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/PerformanceTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/PerformanceTest.java
@@ -156,7 +156,8 @@
mReportLog.printArray("Camera " + id
+ ": Camera launch time", cameraLaunchTimes,
ResultType.LOWER_BETTER, ResultUnit.MS);
- mReportLog.printSummary("Camera " + id, Stat.getAverage(cameraLaunchTimes),
+ mReportLog.printSummary("Camera launch average time for Camera " + id,
+ Stat.getAverage(cameraLaunchTimes),
ResultType.LOWER_BETTER, ResultUnit.MS);
}
finally {
@@ -208,9 +209,9 @@
private void initializeImageReader(String cameraId, int format) throws Exception {
mOrderedPreviewSizes = CameraTestUtils.getSupportedPreviewSizes(
cameraId, mCameraManager, CameraTestUtils.PREVIEW_SIZE_BOUND);
- mPreviewSize = mOrderedPreviewSizes.get(0);
- createImageReader(mPreviewSize, format, NUM_MAX_IMAGES, /*listener*/null);
- updatePreviewSurface(mPreviewSize);
+ Size maxPreviewSize = mOrderedPreviewSizes.get(0);
+ createImageReader(maxPreviewSize, format, NUM_MAX_IMAGES, /*listener*/null);
+ updatePreviewSurface(maxPreviewSize);
}
private void simpleOpenCamera(String cameraId) throws Exception {