Camera: fix false alarms when no camera on device
Bug: 23011926
Change-Id: I51a12cd49fef1a3a05cb5f637c3e827cf4df22b1
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 908e6a5..e118ba4 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/PerformanceTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/PerformanceTest.java
@@ -195,8 +195,10 @@
}
counter++;
}
- mReportLog.printSummary("Camera launch average time for all cameras ",
- Stat.getAverage(avgCameraLaunchTimes), ResultType.LOWER_BETTER, ResultUnit.MS);
+ if (mCameraIds.length != 0) {
+ mReportLog.printSummary("Camera launch average time for all cameras ",
+ Stat.getAverage(avgCameraLaunchTimes), ResultType.LOWER_BETTER, ResultUnit.MS);
+ }
}
/**
@@ -306,8 +308,10 @@
}
// Result will not be reported in CTS report if no summary is printed.
- mReportLog.printSummary("Camera capture result average latency for all cameras ",
- Stat.getAverage(avgResultTimes), ResultType.LOWER_BETTER, ResultUnit.MS);
+ if (mCameraIds.length != 0) {
+ mReportLog.printSummary("Camera capture result average latency for all cameras ",
+ Stat.getAverage(avgResultTimes), ResultType.LOWER_BETTER, ResultUnit.MS);
+ }
}
/**
diff --git a/tests/tests/hardware/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java b/tests/tests/hardware/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java
index 668629b..aa34de3 100644
--- a/tests/tests/hardware/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java
+++ b/tests/tests/hardware/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java
@@ -241,7 +241,12 @@
CameraManager manager = (CameraManager) mContext.getSystemService(Context.CAMERA_SERVICE);
assertNotNull(manager);
String[] cameraIds = manager.getCameraIdList();
- assertNotEmpty(cameraIds);
+
+ if (cameraIds.length == 0) {
+ Log.i(TAG, "Skipping testBasicCamera2ActivityEviction, device has no cameras.");
+ return;
+ }
+
assertTrue(mContext.getMainLooper() != null);
// Setup camera manager
