Fix for multiple merge problem.

Gilles Debunne · Gilles Debunne · commit cdfe899991c3 · 2011-02-04T16:50:01.000-08:00
Change-Id: I5d9c497f44aa9cdc34c195c41e02c3d7353c3fb4
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
@@ -8246,9 +8246,7 @@ public void onTouchModeChanged(boolean isInTouchMode) {
         }
 
         @Override
-        public void onDetached() {
-            removeCallbacks(mHider);
-        }
+        public void onDetached() {}
     }
 
     private void hideInsertionPointCursorController() {

Original file line number	Diff line number	Diff line change
`@@ -8246,9 +8246,7 @@ public void onTouchModeChanged(boolean isInTouchMode) {`
`8246`	`8246`	`}`
`8247`	`8247`
`8248`	`8248`	`@Override`
`8249`		`- public void onDetached() {`
`8250`		`- removeCallbacks(mHider);`
`8251`		`- }`
	`8249`	`+ public void onDetached() {}`
`8252`	`8250`	`}`
`8253`	`8251`
`8254`	`8252`	`private void hideInsertionPointCursorController() {`