From 545a8bbe709ac9646b1c1ad0bbd845d4aef031de Mon Sep 17 00:00:00 2001
From: Alexander Toresson <alexander.toresson@sonymobile.com>
Date: Mon, 14 Oct 2013 14:59:31 +0200
Subject: [PATCH] Fix error overwriting when restoring error

onRestoreInstanceState restores the old error, after layout has been
done. A new error may have been set before this is done, which thus
overwrites the new error.

This patch prevents the new error from being overwritten.

Change-Id: I8e7c91b5da27310fb6698e671d1f7d78ee268061
---
 core/java/android/widget/TextView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 6345b79eb81dc..dc4d2142cc340 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -3809,7 +3809,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             // Display the error later, after the first layout pass
             post(new Runnable() {
                 public void run() {
-                    setError(error);
+                    if (mEditor == null || !mEditor.mErrorWasChanged) {
+                        setError(error);
+                    }
                 }
             });
         }