diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-29 07:12:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-07-29 07:12:32 +0000 |
| commit | 3d2fc380d104e2e8d02ca53c7d919c01c72f1f06 (patch) | |
| tree | f7af25747c4c6a376399d6e50d0fed0a48d68094 | |
| parent | 6d6935e8ff4f8cf2ab57496c67f121cc7291a333 (diff) | |
| parent | c22c92455c540cdceb9eaa1309e9a295eb8922f1 (diff) | |
| download | cts-3d2fc380d104e2e8d02ca53c7d919c01c72f1f06.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24245483'] into udc-release. am: c22c92455c
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24253673
Change-Id: I2ba384d37cda42bd3b1cf09889677a2c0b86b97a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java b/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java index fd288ea68a5..4da9aa7af72 100644 --- a/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java +++ b/tests/camera/src/android/hardware/camera2/cts/CaptureRequestTest.java @@ -44,6 +44,7 @@ import android.hardware.cts.helpers.CameraUtils; import android.media.Image; import android.os.Build; import android.os.Parcel; +import android.platform.test.annotations.AppModeFull; import android.util.ArraySet; import android.util.Log; import android.util.Pair; @@ -862,6 +863,7 @@ public class CaptureRequestTest extends Camera2SurfaceViewTestCase { * Camera API requires that camera timestamps monotonically increase. */ @Test + @AppModeFull(reason = "PropertyUtil methods don't work for instant apps") public void testZoomTimestampIncrease() throws Exception { if (PropertyUtil.getVendorApiLevel() <= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { // Only run test for Vendor API level V or higher |