Merge "cts: Assertion fix for camera characteristics tests."
diff --git a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCharacteristicsTest.java b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCharacteristicsTest.java
index e35d80f..bdc9198 100644
--- a/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCharacteristicsTest.java
+++ b/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCharacteristicsTest.java
@@ -68,10 +68,9 @@
 
                 assertNotNull("Invalid property: android.control.aeAvailableAntibandingModes",
                         props.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_ANTIBANDING_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.aeAvailableAntibandingModes", allKeys.contains(
                         CameraCharacteristics.CONTROL_AE_AVAILABLE_ANTIBANDING_MODES));
 
@@ -91,10 +90,9 @@
 
                 assertNotNull("Invalid property: android.control.aeAvailableModes",
                         props.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.aeAvailableModes", allKeys.contains(
                         CameraCharacteristics.CONTROL_AE_AVAILABLE_MODES));
 
@@ -114,10 +112,9 @@
 
                 assertNotNull("Invalid property: android.control.aeAvailableTargetFpsRanges",
                         props.get(CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.aeAvailableTargetFpsRanges", allKeys.contains(
                         CameraCharacteristics.CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES));
 
@@ -137,10 +134,9 @@
 
                 assertNotNull("Invalid property: android.control.aeCompensationRange",
                         props.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.aeCompensationRange", allKeys.contains(
                         CameraCharacteristics.CONTROL_AE_COMPENSATION_RANGE));
 
@@ -160,10 +156,9 @@
 
                 assertNotNull("Invalid property: android.control.aeCompensationStep",
                         props.get(CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.aeCompensationStep", allKeys.contains(
                         CameraCharacteristics.CONTROL_AE_COMPENSATION_STEP));
 
@@ -183,10 +178,9 @@
 
                 assertNotNull("Invalid property: android.control.afAvailableModes",
                         props.get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.afAvailableModes", allKeys.contains(
                         CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES));
 
@@ -206,10 +200,9 @@
 
                 assertNotNull("Invalid property: android.control.availableEffects",
                         props.get(CameraCharacteristics.CONTROL_AVAILABLE_EFFECTS));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.availableEffects", allKeys.contains(
                         CameraCharacteristics.CONTROL_AVAILABLE_EFFECTS));
 
@@ -229,10 +222,9 @@
 
                 assertNotNull("Invalid property: android.control.availableSceneModes",
                         props.get(CameraCharacteristics.CONTROL_AVAILABLE_SCENE_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.availableSceneModes", allKeys.contains(
                         CameraCharacteristics.CONTROL_AVAILABLE_SCENE_MODES));
 
@@ -252,10 +244,9 @@
 
                 assertNotNull("Invalid property: android.control.availableVideoStabilizationModes",
                         props.get(CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.availableVideoStabilizationModes", allKeys.contains(
                         CameraCharacteristics.CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES));
 
@@ -275,10 +266,9 @@
 
                 assertNotNull("Invalid property: android.control.awbAvailableModes",
                         props.get(CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.awbAvailableModes", allKeys.contains(
                         CameraCharacteristics.CONTROL_AWB_AVAILABLE_MODES));
 
@@ -298,10 +288,9 @@
 
                 assertNotNull("Invalid property: android.control.maxRegionsAe",
                         props.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AE));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.maxRegionsAe", allKeys.contains(
                         CameraCharacteristics.CONTROL_MAX_REGIONS_AE));
 
@@ -321,10 +310,9 @@
 
                 assertNotNull("Invalid property: android.control.maxRegionsAwb",
                         props.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AWB));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.maxRegionsAwb", allKeys.contains(
                         CameraCharacteristics.CONTROL_MAX_REGIONS_AWB));
 
@@ -344,10 +332,9 @@
 
                 assertNotNull("Invalid property: android.control.maxRegionsAf",
                         props.get(CameraCharacteristics.CONTROL_MAX_REGIONS_AF));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.control.maxRegionsAf", allKeys.contains(
                         CameraCharacteristics.CONTROL_MAX_REGIONS_AF));
 
@@ -367,10 +354,9 @@
 
                 assertNotNull("Invalid property: android.edge.availableEdgeModes",
                         props.get(CameraCharacteristics.EDGE_AVAILABLE_EDGE_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.edge.availableEdgeModes", allKeys.contains(
                         CameraCharacteristics.EDGE_AVAILABLE_EDGE_MODES));
 
@@ -390,10 +376,9 @@
 
                 assertNotNull("Invalid property: android.flash.info.available",
                         props.get(CameraCharacteristics.FLASH_INFO_AVAILABLE));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.flash.info.available", allKeys.contains(
                         CameraCharacteristics.FLASH_INFO_AVAILABLE));
 
@@ -413,10 +398,9 @@
 
                 assertNotNull("Invalid property: android.hotPixel.availableHotPixelModes",
                         props.get(CameraCharacteristics.HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.hotPixel.availableHotPixelModes", allKeys.contains(
                         CameraCharacteristics.HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES));
 
@@ -436,10 +420,9 @@
 
                 assertNotNull("Invalid property: android.jpeg.availableThumbnailSizes",
                         props.get(CameraCharacteristics.JPEG_AVAILABLE_THUMBNAIL_SIZES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.jpeg.availableThumbnailSizes", allKeys.contains(
                         CameraCharacteristics.JPEG_AVAILABLE_THUMBNAIL_SIZES));
 
@@ -459,10 +442,9 @@
 
                 assertNotNull("Invalid property: android.lens.facing",
                         props.get(CameraCharacteristics.LENS_FACING));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.lens.facing", allKeys.contains(
                         CameraCharacteristics.LENS_FACING));
 
@@ -482,10 +464,9 @@
 
                 assertNotNull("Invalid property: android.lens.info.availableApertures",
                         props.get(CameraCharacteristics.LENS_INFO_AVAILABLE_APERTURES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.lens.info.availableApertures", allKeys.contains(
                         CameraCharacteristics.LENS_INFO_AVAILABLE_APERTURES));
 
@@ -505,10 +486,9 @@
 
                 assertNotNull("Invalid property: android.lens.info.availableFilterDensities",
                         props.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FILTER_DENSITIES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.lens.info.availableFilterDensities", allKeys.contains(
                         CameraCharacteristics.LENS_INFO_AVAILABLE_FILTER_DENSITIES));
 
@@ -528,10 +508,9 @@
 
                 assertNotNull("Invalid property: android.lens.info.availableFocalLengths",
                         props.get(CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.lens.info.availableFocalLengths", allKeys.contains(
                         CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS));
 
@@ -551,10 +530,9 @@
 
                 assertNotNull("Invalid property: android.lens.info.availableOpticalStabilization",
                         props.get(CameraCharacteristics.LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.lens.info.availableOpticalStabilization", allKeys.contains(
                         CameraCharacteristics.LENS_INFO_AVAILABLE_OPTICAL_STABILIZATION));
 
@@ -578,10 +556,9 @@
 
                 assertNotNull("Invalid property: android.lens.info.hyperfocalDistance",
                         props.get(CameraCharacteristics.LENS_INFO_HYPERFOCAL_DISTANCE));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.lens.info.hyperfocalDistance", allKeys.contains(
                         CameraCharacteristics.LENS_INFO_HYPERFOCAL_DISTANCE));
 
@@ -601,10 +578,9 @@
 
                 assertNotNull("Invalid property: android.lens.info.minimumFocusDistance",
                         props.get(CameraCharacteristics.LENS_INFO_MINIMUM_FOCUS_DISTANCE));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.lens.info.minimumFocusDistance", allKeys.contains(
                         CameraCharacteristics.LENS_INFO_MINIMUM_FOCUS_DISTANCE));
 
@@ -624,10 +600,9 @@
 
                 assertNotNull("Invalid property: android.lens.info.focusDistanceCalibration",
                         props.get(CameraCharacteristics.LENS_INFO_FOCUS_DISTANCE_CALIBRATION));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.lens.info.focusDistanceCalibration", allKeys.contains(
                         CameraCharacteristics.LENS_INFO_FOCUS_DISTANCE_CALIBRATION));
 
@@ -647,10 +622,9 @@
 
                 assertNotNull("Invalid property: android.noiseReduction.availableNoiseReductionModes",
                         props.get(CameraCharacteristics.NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.noiseReduction.availableNoiseReductionModes", allKeys.contains(
                         CameraCharacteristics.NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES));
 
@@ -670,10 +644,9 @@
 
                 assertNotNull("Invalid property: android.request.maxNumOutputRaw",
                         props.get(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_RAW));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.request.maxNumOutputRaw", allKeys.contains(
                         CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_RAW));
 
@@ -693,10 +666,9 @@
 
                 assertNotNull("Invalid property: android.request.maxNumOutputProc",
                         props.get(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.request.maxNumOutputProc", allKeys.contains(
                         CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC));
 
@@ -716,10 +688,9 @@
 
                 assertNotNull("Invalid property: android.request.maxNumOutputProcStalling",
                         props.get(CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC_STALLING));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.request.maxNumOutputProcStalling", allKeys.contains(
                         CameraCharacteristics.REQUEST_MAX_NUM_OUTPUT_PROC_STALLING));
 
@@ -739,10 +710,9 @@
 
                 assertNotNull("Invalid property: android.request.pipelineMaxDepth",
                         props.get(CameraCharacteristics.REQUEST_PIPELINE_MAX_DEPTH));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.request.pipelineMaxDepth", allKeys.contains(
                         CameraCharacteristics.REQUEST_PIPELINE_MAX_DEPTH));
 
@@ -762,10 +732,9 @@
 
                 assertNotNull("Invalid property: android.request.partialResultCount",
                         props.get(CameraCharacteristics.REQUEST_PARTIAL_RESULT_COUNT));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.request.partialResultCount", allKeys.contains(
                         CameraCharacteristics.REQUEST_PARTIAL_RESULT_COUNT));
 
@@ -785,10 +754,9 @@
 
                 assertNotNull("Invalid property: android.request.availableCapabilities",
                         props.get(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.request.availableCapabilities", allKeys.contains(
                         CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES));
 
@@ -808,10 +776,9 @@
 
                 assertNotNull("Invalid property: android.scaler.availableMaxDigitalZoom",
                         props.get(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.scaler.availableMaxDigitalZoom", allKeys.contains(
                         CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM));
 
@@ -831,10 +798,9 @@
 
                 assertNotNull("Invalid property: android.scaler.streamConfigurationMap",
                         props.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.scaler.streamConfigurationMap", allKeys.contains(
                         CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP));
 
@@ -854,10 +820,9 @@
 
                 assertNotNull("Invalid property: android.scaler.croppingType",
                         props.get(CameraCharacteristics.SCALER_CROPPING_TYPE));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.scaler.croppingType", allKeys.contains(
                         CameraCharacteristics.SCALER_CROPPING_TYPE));
 
@@ -877,10 +842,9 @@
 
                 assertNotNull("Invalid property: android.sensor.referenceIlluminant1",
                         props.get(CameraCharacteristics.SENSOR_REFERENCE_ILLUMINANT1));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.referenceIlluminant1", allKeys.contains(
                         CameraCharacteristics.SENSOR_REFERENCE_ILLUMINANT1));
 
@@ -900,10 +864,9 @@
 
                 assertNotNull("Invalid property: android.sensor.referenceIlluminant2",
                         props.get(CameraCharacteristics.SENSOR_REFERENCE_ILLUMINANT2));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.referenceIlluminant2", allKeys.contains(
                         CameraCharacteristics.SENSOR_REFERENCE_ILLUMINANT2));
 
@@ -927,10 +890,9 @@
 
                 assertNotNull("Invalid property: android.sensor.calibrationTransform1",
                         props.get(CameraCharacteristics.SENSOR_CALIBRATION_TRANSFORM1));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.calibrationTransform1", allKeys.contains(
                         CameraCharacteristics.SENSOR_CALIBRATION_TRANSFORM1));
 
@@ -954,10 +916,9 @@
 
                 assertNotNull("Invalid property: android.sensor.calibrationTransform2",
                         props.get(CameraCharacteristics.SENSOR_CALIBRATION_TRANSFORM2));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.calibrationTransform2", allKeys.contains(
                         CameraCharacteristics.SENSOR_CALIBRATION_TRANSFORM2));
 
@@ -981,10 +942,9 @@
 
                 assertNotNull("Invalid property: android.sensor.colorTransform1",
                         props.get(CameraCharacteristics.SENSOR_COLOR_TRANSFORM1));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.colorTransform1", allKeys.contains(
                         CameraCharacteristics.SENSOR_COLOR_TRANSFORM1));
 
@@ -1008,10 +968,9 @@
 
                 assertNotNull("Invalid property: android.sensor.colorTransform2",
                         props.get(CameraCharacteristics.SENSOR_COLOR_TRANSFORM2));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.colorTransform2", allKeys.contains(
                         CameraCharacteristics.SENSOR_COLOR_TRANSFORM2));
 
@@ -1035,10 +994,9 @@
 
                 assertNotNull("Invalid property: android.sensor.forwardMatrix1",
                         props.get(CameraCharacteristics.SENSOR_FORWARD_MATRIX1));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.forwardMatrix1", allKeys.contains(
                         CameraCharacteristics.SENSOR_FORWARD_MATRIX1));
 
@@ -1062,10 +1020,9 @@
 
                 assertNotNull("Invalid property: android.sensor.forwardMatrix2",
                         props.get(CameraCharacteristics.SENSOR_FORWARD_MATRIX2));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.forwardMatrix2", allKeys.contains(
                         CameraCharacteristics.SENSOR_FORWARD_MATRIX2));
 
@@ -1089,10 +1046,9 @@
 
                 assertNotNull("Invalid property: android.sensor.blackLevelPattern",
                         props.get(CameraCharacteristics.SENSOR_BLACK_LEVEL_PATTERN));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.blackLevelPattern", allKeys.contains(
                         CameraCharacteristics.SENSOR_BLACK_LEVEL_PATTERN));
 
@@ -1116,10 +1072,9 @@
 
                 assertNotNull("Invalid property: android.sensor.maxAnalogSensitivity",
                         props.get(CameraCharacteristics.SENSOR_MAX_ANALOG_SENSITIVITY));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.maxAnalogSensitivity", allKeys.contains(
                         CameraCharacteristics.SENSOR_MAX_ANALOG_SENSITIVITY));
 
@@ -1139,10 +1094,9 @@
 
                 assertNotNull("Invalid property: android.sensor.orientation",
                         props.get(CameraCharacteristics.SENSOR_ORIENTATION));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.orientation", allKeys.contains(
                         CameraCharacteristics.SENSOR_ORIENTATION));
 
@@ -1166,10 +1120,9 @@
 
                 assertNotNull("Invalid property: android.sensor.availableTestPatternModes",
                         props.get(CameraCharacteristics.SENSOR_AVAILABLE_TEST_PATTERN_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.availableTestPatternModes", allKeys.contains(
                         CameraCharacteristics.SENSOR_AVAILABLE_TEST_PATTERN_MODES));
 
@@ -1189,10 +1142,9 @@
 
                 assertNotNull("Invalid property: android.sensor.info.activeArraySize",
                         props.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.info.activeArraySize", allKeys.contains(
                         CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE));
 
@@ -1212,10 +1164,9 @@
 
                 assertNotNull("Invalid property: android.sensor.info.sensitivityRange",
                         props.get(CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.info.sensitivityRange", allKeys.contains(
                         CameraCharacteristics.SENSOR_INFO_SENSITIVITY_RANGE));
 
@@ -1235,10 +1186,9 @@
 
                 assertNotNull("Invalid property: android.sensor.info.colorFilterArrangement",
                         props.get(CameraCharacteristics.SENSOR_INFO_COLOR_FILTER_ARRANGEMENT));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.info.colorFilterArrangement", allKeys.contains(
                         CameraCharacteristics.SENSOR_INFO_COLOR_FILTER_ARRANGEMENT));
 
@@ -1258,10 +1208,9 @@
 
                 assertNotNull("Invalid property: android.sensor.info.exposureTimeRange",
                         props.get(CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.info.exposureTimeRange", allKeys.contains(
                         CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE));
 
@@ -1281,10 +1230,9 @@
 
                 assertNotNull("Invalid property: android.sensor.info.maxFrameDuration",
                         props.get(CameraCharacteristics.SENSOR_INFO_MAX_FRAME_DURATION));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.info.maxFrameDuration", allKeys.contains(
                         CameraCharacteristics.SENSOR_INFO_MAX_FRAME_DURATION));
 
@@ -1304,10 +1252,9 @@
 
                 assertNotNull("Invalid property: android.sensor.info.physicalSize",
                         props.get(CameraCharacteristics.SENSOR_INFO_PHYSICAL_SIZE));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.info.physicalSize", allKeys.contains(
                         CameraCharacteristics.SENSOR_INFO_PHYSICAL_SIZE));
 
@@ -1327,10 +1274,9 @@
 
                 assertNotNull("Invalid property: android.sensor.info.pixelArraySize",
                         props.get(CameraCharacteristics.SENSOR_INFO_PIXEL_ARRAY_SIZE));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.info.pixelArraySize", allKeys.contains(
                         CameraCharacteristics.SENSOR_INFO_PIXEL_ARRAY_SIZE));
 
@@ -1350,10 +1296,9 @@
 
                 assertNotNull("Invalid property: android.sensor.info.whiteLevel",
                         props.get(CameraCharacteristics.SENSOR_INFO_WHITE_LEVEL));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.info.whiteLevel", allKeys.contains(
                         CameraCharacteristics.SENSOR_INFO_WHITE_LEVEL));
 
@@ -1373,10 +1318,9 @@
 
                 assertNotNull("Invalid property: android.sensor.info.timestampCalibration",
                         props.get(CameraCharacteristics.SENSOR_INFO_TIMESTAMP_CALIBRATION));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sensor.info.timestampCalibration", allKeys.contains(
                         CameraCharacteristics.SENSOR_INFO_TIMESTAMP_CALIBRATION));
 
@@ -1396,10 +1340,9 @@
 
                 assertNotNull("Invalid property: android.statistics.info.availableFaceDetectModes",
                         props.get(CameraCharacteristics.STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.statistics.info.availableFaceDetectModes", allKeys.contains(
                         CameraCharacteristics.STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES));
 
@@ -1419,10 +1362,9 @@
 
                 assertNotNull("Invalid property: android.statistics.info.maxFaceCount",
                         props.get(CameraCharacteristics.STATISTICS_INFO_MAX_FACE_COUNT));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.statistics.info.maxFaceCount", allKeys.contains(
                         CameraCharacteristics.STATISTICS_INFO_MAX_FACE_COUNT));
 
@@ -1442,10 +1384,9 @@
 
                 assertNotNull("Invalid property: android.statistics.info.availableHotPixelMapModes",
                         props.get(CameraCharacteristics.STATISTICS_INFO_AVAILABLE_HOT_PIXEL_MAP_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.statistics.info.availableHotPixelMapModes", allKeys.contains(
                         CameraCharacteristics.STATISTICS_INFO_AVAILABLE_HOT_PIXEL_MAP_MODES));
 
@@ -1465,10 +1406,9 @@
 
                 assertNotNull("Invalid property: android.tonemap.maxCurvePoints",
                         props.get(CameraCharacteristics.TONEMAP_MAX_CURVE_POINTS));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.tonemap.maxCurvePoints", allKeys.contains(
                         CameraCharacteristics.TONEMAP_MAX_CURVE_POINTS));
 
@@ -1488,10 +1428,9 @@
 
                 assertNotNull("Invalid property: android.tonemap.availableToneMapModes",
                         props.get(CameraCharacteristics.TONEMAP_AVAILABLE_TONE_MAP_MODES));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.tonemap.availableToneMapModes", allKeys.contains(
                         CameraCharacteristics.TONEMAP_AVAILABLE_TONE_MAP_MODES));
 
@@ -1511,10 +1450,9 @@
 
                 assertNotNull("Invalid property: android.info.supportedHardwareLevel",
                         props.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.info.supportedHardwareLevel", allKeys.contains(
                         CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL));
 
@@ -1534,10 +1472,9 @@
 
                 assertNotNull("Invalid property: android.sync.maxLatency",
                         props.get(CameraCharacteristics.SYNC_MAX_LATENCY));
-
                 List<Key<?>> allKeys = props.getKeys();
                 assertNotNull(String.format("Can't get camera characteristics keys from: ID %s",
-                        ids[i], props));
+                        ids[i]), allKeys);
                 assertTrue("Key not in keys list: android.sync.maxLatency", allKeys.contains(
                         CameraCharacteristics.SYNC_MAX_LATENCY));