Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25839f29 authored by Reema Bajwa's avatar Reema Bajwa Committed by Android (Google) Code Review
Browse files

Merge "Do null check before setting credman request" into main

parents df224430 ba6f60d7

core/java/android/view/View.java

+5 −2
Original line number Diff line number Diff line
@@ -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());