diff options
| author | Eugene Susla <eugenesusla@google.com> | 2017-12-11 10:07:03 -0800 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-09-14 20:44:59 +0000 |
| commit | 1252702052aefc618af2c21b960c0c130f8a4e7a (patch) | |
| tree | 60c046aa16c04fa732faa7ecf0dbc524f3aa56b3 | |
| parent | f127326128e1b63b3eb765fb8841de79c01953af (diff) | |
| download | base-1252702052aefc618af2c21b960c0c130f8a4e7a.tar.gz | |
Nullcheck to fix Autofill CTS
Test: presubmit
Fixes: 70506475
Bug: 69981755
Change-Id: I187bed4889a4901a7137a2995178ea651ed09186
(cherry picked from commit 6c68a692880b7cc981e130aace0edb9f2fcffff6)
| -rw-r--r-- | core/java/android/view/accessibility/AccessibilityInteractionClient.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/core/java/android/view/accessibility/AccessibilityInteractionClient.java b/core/java/android/view/accessibility/AccessibilityInteractionClient.java index 7b40bf964b7d..cc2cd7ee8da5 100644 --- a/core/java/android/view/accessibility/AccessibilityInteractionClient.java +++ b/core/java/android/view/accessibility/AccessibilityInteractionClient.java @@ -734,11 +734,14 @@ 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 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) { |