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

Commit 090a4ab7 authored by Eugene Susla's avatar Eugene Susla Committed by android-build-team Robot
Browse files

Nullcheck to fix Autofill CTS 

Test: presubmit
Fixes: 70506475
Bug: 69981755
Change-Id: I187bed4889a4901a7137a2995178ea651ed09186
(cherry picked from commit 6c68a692)
parent 1a13aa57

core/java/android/view/accessibility/AccessibilityInteractionClient.java

+8 −5
Original line number Diff line number Diff line
@@ -734,12 +734,15 @@ public final class AccessibilityInteractionClient 
        if (info != null) {

            info.setConnectionId(connectionId);

            // Empty array means any package name is Okay

            if (!ArrayUtils.isEmpty(packageNames)

                    && !ArrayUtils.contains(packageNames, info.getPackageName().toString())) {

            if (!ArrayUtils.isEmpty(packageNames)) {

                CharSequence packageName = info.getPackageName();

                if (packageName == null

                        || !ArrayUtils.contains(packageNames, packageName.toString())) {

                    // If the node package not one of the valid ones, pick the top one - this

                    // is one of the packages running in the introspected UID.

                    info.setPackageName(packageNames[0]);

                }

            }

            info.setSealed(true);

            if (!bypassCache) {

                sAccessibilityCache.add(info);