Camera: Fix wrong test case enumeration for physical cameras
The issue was a missing replacement from ":" to "." in earlier changes.
Test: Open CtsVerifier and observe test cases for camera 0.4 on Pixel4
Bug: 161671815
Change-Id: I4495ffbab0194f9019437c5ac6035fe8007dfff3
(cherry picked from commit 79132dde9eb0ce81810338f47502ff1c1c0e2c43)
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsTestActivity.java
index c43d5a0..f12770c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsTestActivity.java
@@ -396,7 +396,8 @@
protected void setupItsTests(ArrayTestListAdapter adapter) {
for (String cam : mToBeTestedCameraIds) {
- List<String> scenes = cam.contains(":") ? mHiddenPhysicalCameraSceneIds : mSceneIds;
+ List<String> scenes = cam.contains(ItsUtils.CAMERA_ID_TOKENIZER) ?
+ mHiddenPhysicalCameraSceneIds : mSceneIds;
for (String scene : scenes) {
adapter.add(new DialogTestListItem(this,
testTitle(cam, scene),
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java
index 8f268b0..c648e8e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsUtils.java
@@ -54,6 +54,8 @@
public class ItsUtils {
public static final String TAG = ItsUtils.class.getSimpleName();
+ // The tokenizer must be the same as CAMERA_ID_TOKENIZER in device.py
+ public static final String CAMERA_ID_TOKENIZER = ".";
public static ByteBuffer jsonToByteBuffer(JSONObject jsonObj) {
return ByteBuffer.wrap(jsonObj.toString().getBytes(Charset.defaultCharset()));
@@ -403,8 +405,7 @@
CameraCharacteristics.LENS_INFO_AVAILABLE_FOCAL_LENGTHS);
if (defaultFocalLength != physicalFocalLengths[0]) {
outList.mCameraIds.add(physicalId);
- // The tokenizer must be the same as CAMERA_ID_TOKENIZER in device.py
- outList.mCameraIdCombos.add(id + "." + physicalId);
+ outList.mCameraIdCombos.add(id + CAMERA_ID_TOKENIZER + physicalId);
}
}
