Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nullcheck to fix Autofill CTS

Browse Source 
Test: presubmit
Fixes: 70506475
Bug: 69981755
Change-Id: I187bed4889a4901a7137a2995178ea651ed09186
This commit is contained in:
Eugene Susla
2017-12-11 10:07:03 -08:00
committed by William Gray
parent 984dfe074c
commit 6c68a69288
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/view/accessibility/AccessibilityInteractionClient.java
View File

@@ -738,12 +738,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);