summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel <danieljkim@google.com> 2024-02-23 09:19:27 +0000
committer Daniel <danieljkim@google.com> 2024-02-23 09:24:11 +0000
commitba6f60d77fa98a0b73802d02078888a7b6dc5e9a (patch)
tree2f494a40148a95d887c9ab320d43e211b5b32808
parente7c3efc768d311a765c60bc86556001fbbf1e1ae (diff)
Do null check before setting credman request
Bug: 326541705 Test: minor refactor Change-Id: Ied3e4887d356f1992168bddc505269d28df98f89
-rw-r--r--core/java/android/view/View.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 06dc2755bb48..256a408d33e5 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10889,8 +10889,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());