diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-07 19:36:57 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-07 19:36:57 +0000 |
commit | db14c408ab57c19cad31b0b08b0fb914789e431d (patch) | |
tree | 484999824ae2caf4e91ee7090b1ee5e5cf257b81 | |
parent | 96add30403d55c3032e65bc2d0fe5cf9d0d31cce (diff) | |
parent | d5f0835e55eb8f211d9cce1c5e1aa10c175de1f1 (diff) | |
download | cts-db14c408ab57c19cad31b0b08b0fb914789e431d.tar.gz |
Merge "Guard min resolution req with device API check" into stage-aosp-rvc-ts-dev am: 7ae91f8a28 am: d5f0835e55
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12325784
Change-Id: I33dd86d3d8e166c25e755bdfa6109d8bec261cd2
-rw-r--r-- | tests/sensor/src/android/hardware/cts/SensorTest.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/sensor/src/android/hardware/cts/SensorTest.java b/tests/sensor/src/android/hardware/cts/SensorTest.java index f48ed77c2eb..f64bc751e63 100644 --- a/tests/sensor/src/android/hardware/cts/SensorTest.java +++ b/tests/sensor/src/android/hardware/cts/SensorTest.java @@ -37,6 +37,7 @@ import android.hardware.cts.helpers.sensorverification.ContinuousEventSanitizedV import android.hardware.cts.helpers.sensorverification.EventGapVerification; import android.hardware.cts.helpers.sensorverification.EventOrderingVerification; import android.hardware.cts.helpers.sensorverification.EventTimestampSynchronizationVerification; +import android.os.Build.VERSION_CODES; import android.os.Handler; import android.os.HandlerThread; import android.os.PowerManager; @@ -44,6 +45,7 @@ import android.os.SystemClock; import android.platform.test.annotations.AppModeFull; import android.platform.test.annotations.Presubmit; import android.util.Log; +import com.android.compatibility.common.util.PropertyUtil; import junit.framework.Assert; @@ -563,7 +565,11 @@ public class SensorTest extends SensorTestCase { sensor.getResolution() <= maxResolution); } - if (SensorCtsHelper.hasMinResolutionRequirement(sensor)) { + // The minimum resolution requirement was introduced to the CDD in R so + // it's only possible to assert compliance for devices that release with + // R or later. + if (PropertyUtil.getFirstApiLevel() >= VERSION_CODES.R && + SensorCtsHelper.hasMinResolutionRequirement(sensor)) { float minResolution = SensorCtsHelper.getRequiredMinResolutionForSensor(sensor); assertTrue("Resolution must be >= " + minResolution + ". Resolution =" + sensor.getResolution() + " " + sensor.getName(), |