Merge "Context leaks in EditText causes out of memory"

2015-04-29 04:19:38 +00:00
parent 91132c4eae 5b734f2430
commit 2ddfcc4ade
1 changed files with 2 additions and 3 deletions
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -256,6 +256,7 @@ public class Editor {
        }

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

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

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

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