diff options
author | 2024-02-23 17:47:47 +0000 | |
---|---|---|
committer | 2024-02-23 17:47:47 +0000 | |
commit | 25839f29f43309dbbff4aa9ebda8759f3d1615cd (patch) | |
tree | 39e7dadfca4fac2e5f679d7b33ae95fd5fb60920 | |
parent | df22443061de68a58fb0d536ddaa1760e6377ac3 (diff) | |
parent | ba6f60d77fa98a0b73802d02078888a7b6dc5e9a (diff) |
Merge "Do null check before setting credman request" into main
-rw-r--r-- | core/java/android/view/View.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 383d631c1713..596c52dcfdf6 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -10893,8 +10893,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, structure.setAutofillId(new AutofillId(getAutofillId(), AccessibilityNodeInfo.getVirtualDescendantId(info.getSourceNodeId()))); } - structure.setCredentialManagerRequest(getCredentialManagerRequest(), - getCredentialManagerCallback()); + if (getViewCredentialHandler() != null) { + structure.setCredentialManagerRequest( + getViewCredentialHandler().getRequest(), + getViewCredentialHandler().getCallback()); + } CharSequence cname = info.getClassName(); structure.setClassName(cname != null ? cname.toString() : null); structure.setContentDescription(info.getContentDescription()); |