diff options
| author | Adam Powell <adamp@google.com> | 2011-09-21 18:26:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-21 18:26:13 -0700 |
| commit | c3e4454fdb57391c8d7c77a9d61381d0f4d857e8 (patch) | |
| tree | ce80e3938dbb1c7ab1b469b1f103e7b1302d450c /policy/src/com/android/internal | |
| parent | abb06265efad56434ca8dfa73cad9c9a7dff781d (diff) | |
| parent | 823f074a73cfc23c40a7b576c71daa096ee9ed6a (diff) | |
| download | frameworks_base-c3e4454fdb57391c8d7c77a9d61381d0f4d857e8.zip frameworks_base-c3e4454fdb57391c8d7c77a9d61381d0f4d857e8.tar.gz frameworks_base-c3e4454fdb57391c8d7c77a9d61381d0f4d857e8.tar.bz2 | |
Merge "Fix bug 5300621 - Share menu disappears in gallery"
Diffstat (limited to 'policy/src/com/android/internal')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 9a3031d..bca95d3 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -3471,6 +3471,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } public boolean onOpenSubMenu(MenuBuilder subMenu) { + if (subMenu == null) return false; + // Set a simple callback for the submenu subMenu.setCallback(this); |