summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/CombinedBookmarkHistoryView.java
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-07-11 16:33:10 -0700
committerJohn Reck <jreck@google.com>2011-07-11 16:34:51 -0700
commitdf15e1225d099641aefc284c28cebd5e18fe11eb (patch)
treeed23ed07086241433e350caa5f17aa5911046849 /src/com/android/browser/CombinedBookmarkHistoryView.java
parent017ffabc8af29b0cf14fecc6aad4a61acb8373a2 (diff)
downloadpackages_apps_Browser-df15e1225d099641aefc284c28cebd5e18fe11eb.tar.gz
packages_apps_Browser-df15e1225d099641aefc284c28cebd5e18fe11eb.tar.bz2
packages_apps_Browser-df15e1225d099641aefc284c28cebd5e18fe11eb.zip
Add action bar null check
Bug: 5011681 Add check to see if ComboView was destroyed while still animating Change-Id: I79338a74b181bf0f9244f5e46e7ed6d2b0029eb6
Diffstat (limited to 'src/com/android/browser/CombinedBookmarkHistoryView.java')
-rw-r--r--src/com/android/browser/CombinedBookmarkHistoryView.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java
index 184314e19..4b3e6d843 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryView.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryView.java
@@ -168,6 +168,10 @@ public class CombinedBookmarkHistoryView extends LinearLayout
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);