MUST have a screen at least 6 inches in physical diagonal size.
bug: 119305587
Test: m cts && cts-tradefed run cts
Change-Id: I5b5eac26f65a3c8e74fd141894d745fe8fd5c403
diff --git a/tests/tests/dpi/Android.mk b/tests/tests/dpi/Android.mk
index 951827d..960bed8 100644
--- a/tests/tests/dpi/Android.mk
+++ b/tests/tests/dpi/Android.mk
@@ -17,7 +17,7 @@
include $(CLEAR_VARS)
-LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner junit
+LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner junit compatibility-device-util
LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
diff --git a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
index 144bdde..569b3501 100644
--- a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
+++ b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
@@ -24,6 +24,8 @@
import android.view.Display;
import android.view.WindowManager;
+import com.android.compatibility.common.util.FeatureUtil;
+
import java.util.HashSet;
import java.util.Set;
@@ -44,9 +46,12 @@
double yInches = (double) metrics.heightPixels / metrics.ydpi;
double diagonalInches = Math.sqrt(Math.pow(xInches, 2) + Math.pow(yInches, 2));
double minSize = 2.5d;
- if (getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+ if (FeatureUtil.isWatch()) {
// Watches have a different minimum diagonal.
minSize = 1.0d;
+ } else if (FeatureUtil.isAutomotive()) {
+ // Cars have a different minimum diagonal.
+ minSize = 6.0d;
}
assertTrue("Screen diagonal must be at least " + minSize + " inches: " + diagonalInches,
diagonalInches >= minSize);
