commit 75ad93503ad801e1cf76d69e448f955e3ce5c22b
author Chris Banes <chrisbanes@google.com> Mon Jun 22 11:17:02 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 22 11:17:02 2015 +0000
tree 76138d166ba695d4a62550a7e4c4316785189027
parent 4f5b17adf5017c497b20decab1ba308e088d7ac1
parent 1832f6e483ae37e8b92914819c7e786d6f22f84b

am 1832f6e4: Fix TextInputLayout setErrorEnabled() NPE

* commit '1832f6e483ae37e8b92914819c7e786d6f22f84b':
  Fix TextInputLayout setErrorEnabled() NPE

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();
             }