Fixed
Status Update
Comments
ki...@google.com <ki...@google.com>
te...@google.com <te...@google.com> #2
This is the same as the internal b/148420810
al...@google.com <al...@google.com>
ap...@google.com <ap...@google.com> #3
Project: platform/frameworks/support
Branch: androidx-master-dev
commit 6aab78e2ef9377b16663d979a87083d139856806
Author: Ian Lake <ilake@google.com>
Date: Mon Apr 13 13:15:05 2020
Add @NonNull annotations to internal menu callbacks
Window.Callback was recently to changed to only
take non-null menus / menu items. This updates the
internal AppCompat MenuBuilder.Callback and
MenuPresenter.Callback to add the same @NonNull
annotations.
Test: new BaseBasicsTestCase tests pass
BUG: 142843126
Change-Id: I1fc695406d486d86fe0aa7c3387057b8b3a9160e
M appcompat/appcompat/api/restricted_1.2.0-beta01.txt
M appcompat/appcompat/api/restricted_current.txt
M appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
M appcompat/appcompat/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java
M appcompat/appcompat/src/main/java/androidx/appcompat/app/ToolbarActionBar.java
M appcompat/appcompat/src/main/java/androidx/appcompat/app/WindowDecorActionBar.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/StandaloneActionMode.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/BaseMenuPresenter.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuDialogHelper.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuPresenter.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/SubMenuBuilder.java
M appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuPresenter.java
M appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuView.java
M appcompat/appcompat/src/main/java/androidx/appcompat/widget/PopupMenu.java
https://android-review.googlesource.com/1284518
Branch: androidx-master-dev
commit 6aab78e2ef9377b16663d979a87083d139856806
Author: Ian Lake <ilake@google.com>
Date: Mon Apr 13 13:15:05 2020
Add @NonNull annotations to internal menu callbacks
Window.Callback was recently to changed to only
take non-null menus / menu items. This updates the
internal AppCompat MenuBuilder.Callback and
MenuPresenter.Callback to add the same @NonNull
annotations.
Test: new BaseBasicsTestCase tests pass
BUG: 142843126
Change-Id: I1fc695406d486d86fe0aa7c3387057b8b3a9160e
M appcompat/appcompat/api/restricted_1.2.0-beta01.txt
M appcompat/appcompat/api/restricted_current.txt
M appcompat/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
M appcompat/appcompat/src/main/java/androidx/appcompat/app/AppCompatDelegateImpl.java
M appcompat/appcompat/src/main/java/androidx/appcompat/app/ToolbarActionBar.java
M appcompat/appcompat/src/main/java/androidx/appcompat/app/WindowDecorActionBar.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/StandaloneActionMode.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/BaseMenuPresenter.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuBuilder.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuDialogHelper.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/MenuPresenter.java
M appcompat/appcompat/src/main/java/androidx/appcompat/view/menu/SubMenuBuilder.java
M appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuPresenter.java
M appcompat/appcompat/src/main/java/androidx/appcompat/widget/ActionMenuView.java
M appcompat/appcompat/src/main/java/androidx/appcompat/widget/PopupMenu.java
Description
Component used: AppCompat Version used: appcompat-1.2.0 Devices/Android versions reproduced on: Oreo, API level 26 & 27
To reproduce:
This arises from the fact that
AppCompatTextView.setCustomActionModeCallback
accepts nullables, but internally calls toTextViewCompat.wrapCustomSelectionActionModeCallback
, which requires a non-null callback.Offending lines:
To fix this, the OreoCallback wrapping should be skipped if the callback is null.