summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2011-02-04 16:50:01 -0800
committerandroid-merger <android-build@android.com>2011-02-08 15:30:39 -0800
commitd68621bbd9af2a52b6ac24c9f7aa87b0ab14f630 (patch)
tree08f90937f5942d851e11fef9a325e8a41894b06f
parent537c1c25e903d30cd1426ef714fd66fcaf129612 (diff)
downloadbase-d68621bbd9af2a52b6ac24c9f7aa87b0ab14f630.tar.gz
Fix for multiple merge problem.
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
-rw-r--r--core/java/android/widget/TextView.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index b3da9dd1c126..0afd5a0222af 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8246,9 +8246,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
@Override
- public void onDetached() {
- removeCallbacks(mHider);
- }
+ public void onDetached() {}
}
private void hideInsertionPointCursorController() {