Allow TV Density in Tests
Bug 5085115
Change-Id: I04beb0142083d5bb8b89687a080943e7fd1a3764
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
index 5ff5e67..f5cfa10 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTest.java
@@ -33,11 +33,6 @@
public class ActivityManagerMemoryClassTest
extends ActivityInstrumentationTestCase2<ActivityManagerMemoryClassLaunchActivity> {
- /**
- * A density value used by some TV devices, but not yet in {link DisplayMetrics}.
- */
- private static final int DENSITY_TV = 213;
-
public ActivityManagerMemoryClassTest() {
super(ActivityManagerMemoryClassLaunchActivity.class);
}
@@ -88,7 +83,7 @@
case DisplayMetrics.DENSITY_HIGH:
case DisplayMetrics.DENSITY_XHIGH:
- case DENSITY_TV:
+ case DisplayMetrics.DENSITY_TV:
expectedMinimumMemory = isXLarge ? 48 : 32;
break;
diff --git a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
index cb1b7e5..cfe2ce4 100644
--- a/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
+++ b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
@@ -55,6 +55,7 @@
Set<Integer> allowedDensities = new HashSet<Integer>();
allowedDensities.add(DisplayMetrics.DENSITY_LOW);
allowedDensities.add(DisplayMetrics.DENSITY_MEDIUM);
+ allowedDensities.add(DisplayMetrics.DENSITY_TV);
allowedDensities.add(DisplayMetrics.DENSITY_HIGH);
allowedDensities.add(DisplayMetrics.DENSITY_XHIGH);
assertTrue("DisplayMetrics#densityDpi must be one of the DisplayMetrics.DENSITY_* values: "
