commit f1a313e77c223800f53c0296f2bc7a0f18688ee6
author Shuji Ogasawara <shuji.ogasawara@xacti-co.com> Wed Feb 05 22:38:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 05 22:38:18 2014 +0000
tree 5c88a311bbd2d4589e306db5329ec563ff2c2869
parent 2f35ccfbcf47cda70c21f28e410bdd3233ec8477
parent 9e39a2d6954c5ce6c37e1b024befde0099a87ebd

am 9e39a2d6: am c4878899: am 6f165bfd: am 2ea1e58b: am 54f5302d: am f1fbbde2: am 9fe8a6c7: Fix CtsUiAutomatorTest for landscape devices by running test in "landscape" layout.

* commit '9e39a2d6954c5ce6c37e1b024befde0099a87ebd':
  Fix CtsUiAutomatorTest for landscape devices by running test in "landscape" layout.

tests/tests/util/src/android/util/cts/TypedValueTest.java

diff --git a/tests/tests/util/src/android/util/cts/TypedValueTest.java b/tests/tests/util/src/android/util/cts/TypedValueTest.java
index 5cd7463..2ab91d9 100644
--- a/tests/tests/util/src/android/util/cts/TypedValueTest.java
+++ b/tests/tests/util/src/android/util/cts/TypedValueTest.java
@@ -205,16 +205,4 @@
 
         assertEquals(TypedValue.complexToDimension(10, dm), tv.getDimension(dm));
     }
-
-    public void testComplexToDimensionNoisy() {
-        DisplayMetrics dm = new DisplayMetrics();
-        dm.density = 1.1f;
-        dm.heightPixels = 100;
-        dm.scaledDensity = 2.1f;
-        dm.xdpi = 200f;
-        dm.ydpi = 300f;
-
-        assertEquals(TypedValue.complexToDimension(1, dm),
-                                 TypedValue.complexToDimensionNoisy(1, dm));
-    }
 }