diff options
| author | Clara Bayarri <clarabayarri@google.com> | 2015-06-09 17:18:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 17:18:50 +0000 |
| commit | 0f925d0def01d586108c6ef0683efd8d9bbe1737 (patch) | |
| tree | 3f55a6c9f7326c6749b0774eae91facf3d7b2b60 | |
| parent | 7b8ce2fa0e237c2a740f4648c5046d12b4c84f9b (diff) | |
| parent | 9f8f6e4e1c93025892bb5d8005725bcbdab5830b (diff) | |
| download | frameworks_base-0f925d0def01d586108c6ef0683efd8d9bbe1737.zip frameworks_base-0f925d0def01d586108c6ef0683efd8d9bbe1737.tar.gz frameworks_base-0f925d0def01d586108c6ef0683efd8d9bbe1737.tar.bz2 | |
Merge "Fallback to old Window.Callback#onWindowStartingActionMode" into mnc-dev
| -rw-r--r-- | core/java/com/android/internal/policy/PhoneWindow.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index c010dfe..294e4ba 100644 --- a/core/java/com/android/internal/policy/PhoneWindow.java +++ b/core/java/com/android/internal/policy/PhoneWindow.java @@ -2741,7 +2741,14 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { try { mode = getCallback().onWindowStartingActionMode(wrappedCallback, type); } catch (AbstractMethodError ame) { - // Older apps might not implement this callback method. + // Older apps might not implement the typed version of this method. + if (type == ActionMode.TYPE_PRIMARY) { + try { + mode = getCallback().onWindowStartingActionMode(wrappedCallback); + } catch (AbstractMethodError ame2) { + // Older apps might not implement this callback method at all. + } + } } } if (mode != null) { |