summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fabrice Di Meglio <fdimeglio@google.com> 2011-08-09 18:35:20 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-08-09 18:35:20 -0700
commit3aa7bf7330eaf231d00f7dfdcb504215822148be (patch)
tree600f32992db2759d47f83865fbfad23fecb68f03
parent4a3e79cfb3a5261bce65db5fda1a10a942cc9e85 (diff)
parentb8503eb8ac26c4801b565fcfc655fca02f9bb726 (diff)
Merge "Fix bug #5017432 NPE when mixing different spans with different font sizes"
-rw-r--r--core/java/android/text/style/TextAppearanceSpan.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/style/TextAppearanceSpan.java b/core/java/android/text/style/TextAppearanceSpan.java
index deed713334d4..5fd7c57db22e 100644
--- a/core/java/android/text/style/TextAppearanceSpan.java
+++ b/core/java/android/text/style/TextAppearanceSpan.java
@@ -205,7 +205,7 @@ public class TextAppearanceSpan extends MetricAffectingSpan implements Parcelabl
}
if (mTextColorLink != null) {
- ds.linkColor = mTextColor.getColorForState(ds.drawableState, 0);
+ ds.linkColor = mTextColorLink.getColorForState(ds.drawableState, 0);
}
}