commit 2ceea2160e4ca89c426c2fcf9c77029ecf15e3e1
author Alan Viverette <alanv@google.com> Wed Apr 29 05:34:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 29 05:34:45 2015 +0000
tree 8084f36da87e4ed5c8cc02d84a0fcc709082e359
parent 8d5f3638747efe61bee05d0da16202b2eb806c91
parent 9c36ee9b4f42909c1a425322e4e2d3e86dd6edc5

am 9c36ee9b: am 2ddfcc4a: Merge "Context leaks in EditText causes out of memory"

* commit '9c36ee9b4f42909c1a425322e4e2d3e86dd6edc5':
  Context leaks in EditText causes out of memory

core/java/android/widget/Editor.java

diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index 35e7389..ced7e65 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -318,6 +318,7 @@
         }
 
         getPositionListener().addSubscriber(mCursorAnchorInfoNotifier, true);
+        resumeBlink();
     }
 
     void onDetachedFromWindow() {
@@ -327,9 +328,7 @@
             hideError();
         }
 
-        if (mBlink != null) {
-            mBlink.removeCallbacks(mBlink);
-        }
+        suspendBlink();
 
         if (mInsertionPointCursorController != null) {
             mInsertionPointCursorController.onDetached();