summaryrefslogtreecommitdiff
path: root/android/view/MenuInflater_Delegate.java
diff options
context:
space:
mode:
Diffstat (limited to 'android/view/MenuInflater_Delegate.java')
-rw-r--r--android/view/MenuInflater_Delegate.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/android/view/MenuInflater_Delegate.java b/android/view/MenuInflater_Delegate.java
index 977a2a72..d16d8519 100644
--- a/android/view/MenuInflater_Delegate.java
+++ b/android/view/MenuInflater_Delegate.java
@@ -56,7 +56,10 @@ public class MenuInflater_Delegate {
}
}
- if (menuItem == null || !menuItem.getClass().getName().startsWith("android.support.")) {
+ String menuItemName = menuItem != null ? menuItem.getClass().getName() : null;
+ if (menuItemName == null ||
+ !menuItemName.startsWith("android.support.") ||
+ !menuItemName.startsWith("androidx.")) {
// This means that Bridge did not take over the instantiation of some object properly.
// This is most likely a bug in the LayoutLib code.
// We suppress this error for AppCompat menus since we do not support them in the menu