commit df15e1225d099641aefc284c28cebd5e18fe11eb
author John Reck <jreck@google.com> Mon Jul 11 16:33:10 2011 -0700
committer John Reck <jreck@google.com> Mon Jul 11 16:34:51 2011 -0700
tree ed23ed07086241433e350caa5f17aa5911046849
parent 017ffabc8af29b0cf14fecc6aad4a61acb8373a2

Add action bar null check

 Bug: 5011681
 Add check to see if ComboView was destroyed while still animating

Change-Id: I79338a74b181bf0f9244f5e46e7ed6d2b0029eb6

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