diff options
| author | Alan Viverette <alanv@google.com> | 2016-01-04 13:43:23 -0500 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2016-01-04 13:43:23 -0500 |
| commit | 28a8468995c71ba3fbba12557d143e7599db38d8 (patch) | |
| tree | e27aab48d98662ee7863f418f69eb6538cb2ced8 /core/java/android/widget/ActionMenuView.java | |
| parent | f43f627fc97e70d79345192654c65ba87f0a4efb (diff) | |
Avoid NPE when ActionMenuPresenter is intialized with null MenuBuilder
Also adds annotations to accurately reflect nullability.
Bug: 26318920
Change-Id: Ia3b170dd301edfc0088a11ee5764c24bab2f10aa
Diffstat (limited to 'core/java/android/widget/ActionMenuView.java')
| -rw-r--r-- | core/java/android/widget/ActionMenuView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/ActionMenuView.java b/core/java/android/widget/ActionMenuView.java index 1f02c3b33e03..4d0a1c86fd92 100644 --- a/core/java/android/widget/ActionMenuView.java +++ b/core/java/android/widget/ActionMenuView.java @@ -622,7 +622,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo } /** @hide */ - public void initialize(MenuBuilder menu) { + public void initialize(@Nullable MenuBuilder menu) { mMenu = menu; } |