diff options
| author | Adam Powell <adamp@google.com> | 2010-08-12 10:44:33 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2010-08-12 10:44:33 -0700 |
| commit | b047208b3b3391d5c9b0114b0906341240f48368 (patch) | |
| tree | 49a394c29c4ed349150d740e78cb3f9d7732976b | |
| parent | 5caaf378d845c8e0453e10f89d7f5d6b339e474d (diff) | |
| download | frameworks_base-b047208b3b3391d5c9b0114b0906341240f48368.zip frameworks_base-b047208b3b3391d5c9b0114b0906341240f48368.tar.gz frameworks_base-b047208b3b3391d5c9b0114b0906341240f48368.tar.bz2 | |
Cleanup on CL 61012
Change-Id: I394909c65a4978be26db063c9f69f1098ab028b3
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 546c0f4..a410fa4 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -647,10 +647,9 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { if (mActionBar.isOverflowReserved()) { if (!mActionBar.isOverflowMenuShowing()) { final Callback cb = getCallback(); - if (cb != null) { - if (cb.onPreparePanel(featureId, st.createdPanelView, st.menu)) { - playSoundEffect = mActionBar.showOverflowMenu(); - } + if (cb != null && + cb.onPreparePanel(featureId, st.createdPanelView, st.menu)) { + playSoundEffect = mActionBar.showOverflowMenu(); } } else { playSoundEffect = mActionBar.hideOverflowMenu(); |