commit c41b6dab84e318722d6949775303eb6edb0fee4d
author John Reck <jreck@google.com> Mon Jul 11 17:09:29 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 11 17:09:29 2011 -0700
tree 10adb9bf979811dc5f9bd525e5c1a40ecb3d18c5
parent df15e1225d099641aefc284c28cebd5e18fe11eb
parent 24bdcb98d296f1b31e83379db27d978b90534fef

Merge "Null check"

src/com/android/browser/CombinedBookmarkHistoryView.java

diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java
index 184314e..4b3e6d8 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryView.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryView.java
@@ -168,6 +168,10 @@
             public void onAnimationEnd(Animator animation) {
                 super.onAnimationEnd(animation);
                 mIsAnimating = false;
+                if (mActionBar == null) {
+                    // We were destroyed, return
+                    return;
+                }
                 FragmentManager fm = mActivity.getFragmentManager();
                 FragmentTransaction ft = fm.beginTransaction();
                 onTabSelected(mActionBar.getSelectedTab(), ft);