[automerger] Nullcheck to fix Autofill CTS am: 6c68a69288 am: 743abb939a am:... (775b8adf) · Commits · e / os / android_frameworks_base

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);