commit 1832f6e483ae37e8b92914819c7e786d6f22f84b
author Chris Banes <chrisbanes@google.com> Thu Jun 18 19:30:30 2015 +0100
committer Chris Banes <chrisbanes@google.com> Mon Jun 22 12:06:24 2015 +0100
tree b61c3baf3fd9b717155bfc1aaafcac4af74a9ed9
parent 56606fdfdbdf57b691d76a0234b83e6a3788069f

Fix TextInputLayout setErrorEnabled() NPE

Caused by the animation end listener referencing
the now-null error TextView.

BUG: 21991987

Change-Id: Iacba13fb6d3a5d3fcf9069a73d94c91431f13fd4

design/src/android/support/design/widget/TextInputLayout.java

diff --git a/design/src/android/support/design/widget/TextInputLayout.java b/design/src/android/support/design/widget/TextInputLayout.java
index 15173cc..4332d10 100644
--- a/design/src/android/support/design/widget/TextInputLayout.java
+++ b/design/src/android/support/design/widget/TextInputLayout.java
@@ -277,6 +277,10 @@
      */
     public void setErrorEnabled(boolean enabled) {
         if (mErrorEnabled != enabled) {
+            if (mErrorView != null) {
+                ViewCompat.animate(mErrorView).cancel();
+            }
+
             if (enabled) {
                 mErrorView = new TextView(getContext());
                 mErrorView.setTextAppearance(getContext(), mErrorTextAppearance);
@@ -334,8 +338,7 @@
                         .setListener(new ViewPropertyAnimatorListenerAdapter() {
                             @Override
                             public void onAnimationEnd(View view) {
-                                mErrorView.setText(null);
-                                mErrorView.setVisibility(INVISIBLE);
+                                view.setVisibility(INVISIBLE);
                             }
                         }).start();
             }