From 4363054966bb40ade4c83fa2620d43d0058297ad Mon Sep 17 00:00:00 2001 From: Julien Desprez Date: Tue, 5 Jul 2016 10:59:32 +0100 Subject: Fix project warnings for easier readability Fix imports, javadocs, exception warnings to improve the readability of the project in IDE. Bug: 29964378 Change-Id: Ib1b0e15ac8d281c5462147f013015039e8a2cfe1 --- .../media/tests/Camera2FrameworkStressTest.java | 21 ++++++++++++--------- src/com/android/media/tests/Camera2StressTest.java | 22 +++++++++++++--------- src/com/android/media/tests/CameraTestBase.java | 3 ++- .../android/media/tests/VideoMultimeterTest.java | 1 - 4 files changed, 27 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/com/android/media/tests/Camera2FrameworkStressTest.java b/src/com/android/media/tests/Camera2FrameworkStressTest.java index 5bd3f21..139eda7 100644 --- a/src/com/android/media/tests/Camera2FrameworkStressTest.java +++ b/src/com/android/media/tests/Camera2FrameworkStressTest.java @@ -51,7 +51,6 @@ public class Camera2FrameworkStressTest extends CameraTestBase { "^fwk-stress_camera_(?.+).txt"); private static final String KEY_NUM_ATTEMPTS = "numAttempts"; private static final String KEY_ITERATION = "iteration"; - private static final String KEY_CAMERA_ID = "cameraId"; public Camera2FrameworkStressTest() { // Note that default value in constructor will be overridden by the passing option from @@ -123,15 +122,19 @@ public class Camera2FrameworkStressTest extends CameraTestBase { // Parse results from log file that contain the key-value pairs. // eg. "numAttempts=10|iteration=9[|cameraId=0]" - while ((line = reader.readLine()) != null) { - String[] pairs = line.split("\\|"); - for (String pair : pairs) { - String[] keyValue = pair.split("="); - // Each should be a pair of key and value. - String key = keyValue[0].trim(); - String value = keyValue[1].trim(); - resultMap.put(key, value); + try { + while ((line = reader.readLine()) != null) { + String[] pairs = line.split("\\|"); + for (String pair : pairs) { + String[] keyValue = pair.split("="); + // Each should be a pair of key and value. + String key = keyValue[0].trim(); + String value = keyValue[1].trim(); + resultMap.put(key, value); + } } + } finally { + reader.close(); } // Fail if a stress test doesn't start. diff --git a/src/com/android/media/tests/Camera2StressTest.java b/src/com/android/media/tests/Camera2StressTest.java index 55d9ba1..eb5cfa4 100644 --- a/src/com/android/media/tests/Camera2StressTest.java +++ b/src/com/android/media/tests/Camera2StressTest.java @@ -133,16 +133,20 @@ public class Camera2StressTest extends CameraTestBase { // Parse results from log file that contain the key-value pairs. // eg. "numAttempts=10|iteration=9" - while ((line = reader.readLine()) != null) { - String[] pairs = line.split("\\|"); - for (String pair : pairs) { - String[] keyValue = pair.split("="); - // Each should be a pair of key and value. - String key = keyValue[0].trim(); - String value = keyValue[1].trim(); - resultMap.put(key, value); - CLog.v("%s: %s", key, value); + try { + while ((line = reader.readLine()) != null) { + String[] pairs = line.split("\\|"); + for (String pair : pairs) { + String[] keyValue = pair.split("="); + // Each should be a pair of key and value. + String key = keyValue[0].trim(); + String value = keyValue[1].trim(); + resultMap.put(key, value); + CLog.v("%s: %s", key, value); + } } + } finally { + reader.close(); } // Fail if a stress test doesn't start. diff --git a/src/com/android/media/tests/CameraTestBase.java b/src/com/android/media/tests/CameraTestBase.java index 0c4a734..81c07d5 100644 --- a/src/com/android/media/tests/CameraTestBase.java +++ b/src/com/android/media/tests/CameraTestBase.java @@ -63,7 +63,6 @@ import java.util.concurrent.TimeUnit; */ public class CameraTestBase implements IDeviceTest, IRemoteTest, IConfigurationReceiver { - private static final String LOG_TAG = CameraTestBase.class.getSimpleName(); private static final long SHELL_TIMEOUT_MS = 60 * 1000; // 1 min private static final int SHELL_MAX_ATTEMPTS = 3; protected static final String PROCESS_CAMERA_DAEMON = "mm-qcamera-daemon"; @@ -425,6 +424,7 @@ public class CameraTestBase implements IDeviceTest, IRemoteTest, IConfigurationR super(listener); } + @Override public void handleMetricsOnTestEnded(TestIdentifier test, Map testMetrics) { if (testMetrics == null) { return; // No-op if there is nothing to post. @@ -432,6 +432,7 @@ public class CameraTestBase implements IDeviceTest, IRemoteTest, IConfigurationR getAggregatedMetrics().putAll(testMetrics); } + @Override public void handleTestRunEnded(ITestInvocationListener listener, long elapsedTime, Map runMetrics) { // Post aggregated metrics at the end of test run. diff --git a/src/com/android/media/tests/VideoMultimeterTest.java b/src/com/android/media/tests/VideoMultimeterTest.java index 34e8e0d..7829f9d 100644 --- a/src/com/android/media/tests/VideoMultimeterTest.java +++ b/src/com/android/media/tests/VideoMultimeterTest.java @@ -33,7 +33,6 @@ import com.android.tradefed.util.IRunUtil; import com.android.tradefed.util.RunUtil; import java.io.ByteArrayInputStream; -import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -- cgit v1.2.3