From d76cee2b09866c5a22c1de45becc03677be52e95 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Mon, 31 Jan 2011 15:05:05 -0800
Subject: [PATCH] Fix bug 3408834 - actionbar stays gone when leaving reader in
 lightsout mode

Fix an opportunity for race conditions when the action bar is
shown/hidden rapidly.

Change-Id: I91c0666cad3afd8a4d870d642f971949fba0d333
---
 core/java/com/android/internal/app/ActionBarImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index b1b5d71582841..471a5a91f7b12 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -480,12 +480,12 @@ public class ActionBarImpl extends ActionBar {
 
     @Override
     public void show() {
-        if (mContainerView.getVisibility() == View.VISIBLE) {
-            return;
-        }
         if (mCurrentAnim != null) {
             mCurrentAnim.end();
         }
+        if (mContainerView.getVisibility() == View.VISIBLE) {
+            return;
+        }
         mContainerView.setVisibility(View.VISIBLE);
         mContainerView.setAlpha(0);
         AnimatorSet anim = new AnimatorSet();