commit 93b6bc3d15180d3ff88fe769375717043b283e64
author Adam Powell <adamp@google.com> Thu Jul 22 11:36:35 2010 -0700
committer Adam Powell <adamp@google.com> Thu Jul 22 11:36:35 2010 -0700
tree 111f7db40d948e5b3c82955b3a5284ebb46674d7
parent 612f8da2bc994043f26a278a9b1c2b681eabc4c9

Make finish() a no-op on a context mode that is not active.

Change-Id: I2b3b304b7371a76ce67dcf197eaea2e77904399b

core/java/com/android/internal/app/ActionBarImpl.java

diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index 409edf9..050f630 100644
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -383,6 +383,11 @@
 
         @Override
         public void finish() {
+            if (mContextMode != this) {
+                // Not the active context mode - no-op
+                return;
+            }
+
             mCallback.onDestroyContextualMode(this);
             mAnimatorView.setDisplayedChild(NORMAL_VIEW);