diff options
| -rw-r--r-- | apps/CtsVerifier/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java | 6 | ||||
| -rw-r--r-- | tools/cts-tradefed/Android.mk | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml index 97f0ccfee3e..0908a4870ec 100644 --- a/apps/CtsVerifier/AndroidManifest.xml +++ b/apps/CtsVerifier/AndroidManifest.xml @@ -18,7 +18,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.cts.verifier" android:versionCode="5" - android:versionName="7.1_r11"> + android:versionName="7.1_r12"> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="25"/> diff --git a/tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java b/tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java index 25e9c5cd9c9..97fa6d18090 100644 --- a/tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java +++ b/tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java @@ -2263,19 +2263,19 @@ public class CameraTestUtils extends Assert { * string. Same rule applies to the rest of sub second tags. */ int subSecTime = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME, /*defaultValue*/-1); - collector.expectTrue("Exif TAG_SUBSEC_TIME value is null or invalid!", subSecTime > 0); + collector.expectTrue("Exif TAG_SUBSEC_TIME value is null or invalid!", subSecTime >= 0); // TAG_SUBSEC_TIME_ORIG int subSecTimeOrig = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME_ORIG, /*defaultValue*/-1); collector.expectTrue("Exif TAG_SUBSEC_TIME_ORIG value is null or invalid!", - subSecTimeOrig > 0); + subSecTimeOrig >= 0); // TAG_SUBSEC_TIME_DIG int subSecTimeDig = exif.getAttributeInt(ExifInterface.TAG_SUBSEC_TIME_DIG, /*defaultValue*/-1); collector.expectTrue( - "Exif TAG_SUBSEC_TIME_DIG value is null or invalid!", subSecTimeDig > 0); + "Exif TAG_SUBSEC_TIME_DIG value is null or invalid!", subSecTimeDig >= 0); } diff --git a/tools/cts-tradefed/Android.mk b/tools/cts-tradefed/Android.mk index 7b4a8cd1167..0ef8a824d1e 100644 --- a/tools/cts-tradefed/Android.mk +++ b/tools/cts-tradefed/Android.mk @@ -25,7 +25,7 @@ LOCAL_SUITE_BUILD_NUMBER := $(BUILD_NUMBER_FROM_FILE) LOCAL_SUITE_TARGET_ARCH := $(TARGET_ARCH) LOCAL_SUITE_NAME := CTS LOCAL_SUITE_FULLNAME := "Compatibility Test Suite" -LOCAL_SUITE_VERSION := 7.1_r11 +LOCAL_SUITE_VERSION := 7.1_r12 LOCAL_MODULE := cts-tradefed |