Nullcheck to fix Autofill CTS
Test: presubmit
Fixes: 70506475
Bug: 69981755
Change-Id: I187bed4889a4901a7137a2995178ea651ed09186
(cherry picked from commit 6c68a692880b7cc981e130aace0edb9f2fcffff6)
diff --git a/core/java/android/view/accessibility/AccessibilityInteractionClient.java b/core/java/android/view/accessibility/AccessibilityInteractionClient.java
index be3b34d..980a2c9 100644
--- a/core/java/android/view/accessibility/AccessibilityInteractionClient.java
+++ b/core/java/android/view/accessibility/AccessibilityInteractionClient.java
@@ -734,11 +734,14 @@
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 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]);
+ 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) {