From ba6f60d77fa98a0b73802d02078888a7b6dc5e9a Mon Sep 17 00:00:00 2001
From: Daniel <danieljkim@google.com>
Date: Fri, 23 Feb 2024 09:19:27 +0000
Subject: Do null check before setting credman request

Bug: 326541705
Test: minor refactor
Change-Id: Ied3e4887d356f1992168bddc505269d28df98f89
---
 core/java/android/view/View.java | 7 +++++--
 1 file 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());
-- 
cgit v1.2.3-59-g8ed1b