commit 54b98b1c3319f1eb75a8adb075766f65ad524ec0
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 31 04:19:54 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 31 04:19:54 2023 +0000
tree 24ed90aea8d3b90158b961ecc074bf10276c73de
parent c80c3801301e329ac19d6c694a02d00aa4e16a54
parent e10b25a1251b4382b67769c14f4466145f79a14b

Merge "Camera: API Gate activePhysicalCameraId during #testRepeatingRaw" into android13-tests-dev am: c9cd1d4f87 am: edcae6af12 am: e10b25a125

Original change: https://android-review.googlesource.com/c/platform/cts/+/2511697

Change-Id: I1e69e5afb80f3d037fd558a708b3cdea9c1ca3ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java

diff --git a/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java b/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
index 28bb02e..6090cdc 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
@@ -59,12 +59,14 @@
 import android.media.Image.Plane;
 import android.media.ImageReader;
 import android.media.ImageWriter;
+import android.os.Build;
 import android.os.SystemClock;
 import android.os.ConditionVariable;
 import android.util.Log;
 import android.util.Size;
 import android.view.Surface;
 
+import com.android.compatibility.common.util.PropertyUtil;
 import com.android.ex.camera2.blocking.BlockingSessionCallback;
 
 import org.junit.Test;
@@ -1454,7 +1456,9 @@
             if (mStaticInfo.isCapabilitySupported(
                     CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS)) {
                 StaticMetadata staticInfo = mStaticInfo;
-                if (mStaticInfo.isLogicalMultiCamera()
+                boolean supportActivePhysicalIdConsistency =
+                        PropertyUtil.getFirstApiLevel() >= Build.VERSION_CODES.S;
+                if (mStaticInfo.isLogicalMultiCamera() && supportActivePhysicalIdConsistency
                         && mStaticInfo.isActivePhysicalCameraIdSupported()) {
                     String activePhysicalId =
                             result.get(CaptureResult.LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_ID);