commit d4ea082508742355a8a3e4c2dc7256d370a76781
author Nicholas Sauer <nicksauer@google.com> Thu Feb 06 03:50:54 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 06 03:50:54 2014 +0000
tree 5c88a311bbd2d4589e306db5329ec563ff2c2869
parent 072ab9d882298378210c0c734b07774a50e0bebd
parent b1a9e89c04ea0af4d116e15e6154203e80747cad

am b1a9e89c: am c0206763: am ae8cc846: am 4f8604a2: am ff760448: am a3a37fd2: am 7a4c8877: am b1a8a3b7: am 589787a2: am 6d2d5623: am e9ea138a: Merge "Revert "Use real screen width/height to calculate aspect ratio"" into jb-dev

* commit 'b1a9e89c04ea0af4d116e15e6154203e80747cad':
  Revert "Use real screen width/height to calculate aspect ratio"

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