commit c391a9888c6c3038a53fd53c330a65f68ff09a28
author Adam Powell <adamp@google.com> Tue Jun 14 20:29:03 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 14 20:29:03 2011 -0700
tree 08def065db7a84492a65c092427fb459375f58b7
parent c02fc922ff58b6ccfbdd549a36f58f4511851b01
parent 251df77861525cca79d38bcee7c45c16c6752e40

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

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