diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-31 02:18:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-31 02:18:09 +0000 |
| commit | edcae6af128c451636627b16803f59a418b66d21 (patch) | |
| tree | 457b5e8db3269275c0e91bf2130ec1b12f69da54 | |
| parent | 05e6e185cb96d19b480f120b049dec938a3c3a66 (diff) | |
| parent | c9cd1d4f87ce9f26757832b972cfb2aaef2ad3e8 (diff) | |
| download | cts-edcae6af128c451636627b16803f59a418b66d21.tar.gz | |
Merge "Camera: API Gate activePhysicalCameraId during #testRepeatingRaw" into android13-tests-dev am: c9cd1d4f87
Original change: https://android-review.googlesource.com/c/platform/cts/+/2511697
Change-Id: Ic928540e91cdd48327124fc31da380ffd0d714c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java b/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java index 28bb02ebba7..6090cdce8b1 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; 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 @@ public class ImageReaderTest extends Camera2AndroidTestCase { 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); |