commit 251df77861525cca79d38bcee7c45c16c6752e40
author Adam Powell <adamp@google.com> Tue Jun 14 20:24:34 2011 -0700
committer Adam Powell <adamp@google.com> Tue Jun 14 20:24:34 2011 -0700
tree fd573eb7ae21c2c1995b5392bb1d262032aa9967
parent 146a0103f468b15ec3ef7dcee5d16bf808a3ad2e

Fix bug 4521549 - Crash in ScrollingTabContainerView, when using a tab
with null text

Change-Id: I6c287c95bafa732018048c11933ddba82fa26d9f

core/java/com/android/internal/widget/ScrollingTabContainerView.java

diff --git a/core/java/com/android/internal/widget/ScrollingTabContainerView.java b/core/java/com/android/internal/widget/ScrollingTabContainerView.java
index c7d37f2..5b4d7ab 100644
--- a/core/java/com/android/internal/widget/ScrollingTabContainerView.java
+++ b/core/java/com/android/internal/widget/ScrollingTabContainerView.java
@@ -236,8 +236,9 @@
                     }
                     mTextView.setText(text);
                     mTextView.setVisibility(VISIBLE);
-                } else {
+                } else if (mTextView != null) {
                     mTextView.setVisibility(GONE);
+                    mTextView.setText(null);
                 }
             }
         }