diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 4ad75a6365013..bc8b53553cb97 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -3634,9 +3634,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         }
         if (mHintTextColor != null) {
             color = mHintTextColor.getColorForState(getDrawableState(), 0);
-            if (color != mCurHintTextColor && mText.length() == 0) {
+            if (color != mCurHintTextColor) {
                 mCurHintTextColor = color;
-                inval = true;
+                if (mText.length() == 0) {
+                    inval = true;
+                }
             }
         }
         if (inval) {