commit 1fd73d72f21c993721c7091b15fc651091a5bab8
author sharada <sharadax.palasamudram.ashok.kumar@intel.com> Wed Feb 05 22:38:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 05 22:38:20 2014 +0000
tree 5c88a311bbd2d4589e306db5329ec563ff2c2869
parent f1a313e77c223800f53c0296f2bc7a0f18688ee6
parent 1eb55c2799979e2e5d519c1d4f7dcbd912a6126e

am 1eb55c27: am e55bf0a0: am 1ebc592c: am 19da3f7c: am b792d3c6: am 934180d9: am 2739fb79: am 678dc41d: am 655ec491: am 2e452ccf: am a0b1c0f9: Cherry-pick: Use getAssetUrl() to access files present in assets folder from master.

* commit '1eb55c2799979e2e5d519c1d4f7dcbd912a6126e':
  Cherry-pick: Use getAssetUrl() to access files present in assets folder from master.

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