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

* commit '2ddfcc4ade5d6db69808a340ae54280872559ec1': Context leaks in EditText causes out of memory
2015-04-29 04:54:28 +00:00
parent cde209f2b6 2ddfcc4ade
commit 9c36ee9b4f
1 changed files with 2 additions and 3 deletions
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -319,6 +319,7 @@ public class Editor {
        }

        getPositionListener().addSubscriber(mCursorAnchorInfoNotifier, true);
+        resumeBlink();
    }

    void onDetachedFromWindow() {
@@ -328,9 +329,7 @@ public class Editor {
            hideError();
        }

-        if (mBlink != null) {
-            mBlink.removeCallbacks(mBlink);
-        }
+        suspendBlink();

        if (mInsertionPointCursorController != null) {
            mInsertionPointCursorController.onDetached();