Merge "Nullcheck to fix Autofill CTS" (ac6aaf5f) · Commits · e / os / android_frameworks_base

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

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -790,12 +790,15 @@ public final class AccessibilityInteractionClient
	if (info != null) {		if (info != null) {
	info.setConnectionId(connectionId);		info.setConnectionId(connectionId);
	// Empty array means any package name is Okay		// Empty array means any package name is Okay
	if (!ArrayUtils.isEmpty(packageNames)		if (!ArrayUtils.isEmpty(packageNames)) {
	&& !ArrayUtils.contains(packageNames, info.getPackageName().toString())) {		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		// 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.		// is one of the packages running in the introspected UID.
	info.setPackageName(packageNames[0]);		info.setPackageName(packageNames[0]);
	}		}
			}
	info.setSealed(true);		info.setSealed(true);
	if (!bypassCache) {		if (!bypassCache) {
	sAccessibilityCache.add(info);		sAccessibilityCache.add(info);