commit 7a2d622974382a91c455c628862d6055956eb45c
author Colin Cross <ccross@android.com> Tue Jan 28 01:07:25 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 28 01:07:25 2014 +0000
tree 303293ff7cfa433ae6a5f19c4d585b60f374eb8a
parent e86f98dd5468f8c4cfa59ebcd3ccb49e75311156
parent 4f0ae8533816d3df820f89653782ef71910e8cb0

am 4f0ae853: am afe64d7b: Merge "cts: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"

* commit '4f0ae8533816d3df820f89653782ef71910e8cb0':
  cts: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH

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));
-    }
 }