commit cd4df43374de1e5616aaca362bb1c0c30e56bbe4
author Brian Muramatsu <btmura@google.com> Wed Feb 02 14:19:23 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 02 14:19:23 2011 -0800
tree b90d717f981d3dd385583be214e472e560cfe8f4
parent b881d63217ba5609879256dddf916e2f8f8b7131
parent 8b76fb121a40e93bbf13919482761b50654878bf

Merge "Fix TextViewTest#testAccessError" into honeycomb

tests/tests/widget/src/android/widget/cts/TextViewTest.java

diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index 703b76b..dd8ea7f 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -44,6 +44,7 @@
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Debug;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.TouchUtils;
 import android.test.UiThreadTest;
@@ -1806,7 +1807,7 @@
         // a key event that will not change the TextView's text
         assertEquals("", mTextView.getText().toString());
         // The icon and error message will not be reset to null
-        assertNotNull(mTextView.getError());
+        assertNull(mTextView.getError());
 
         mInstrumentation.sendStringSync("1");
         // a key event cause changes to the TextView's text