diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-12-12 05:47:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-12-12 05:47:48 +0000 |
| commit | ac6aaf5fdd5bcd9dee5a6c7b7a4a1ef7dbcc482c (patch) | |
| tree | 094fc193c088a524ba97d88a2850b09e26069253 /core/java/android | |
| parent | c0d9aa1633a3c78475fd3cb2345a68462f6735df (diff) | |
| parent | dfb43327da7f7e7c814e670d7eb2270c73ef5b68 (diff) | |
Merge "Nullcheck to fix Autofill CTS"
Diffstat (limited to 'core/java/android')
| -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 e14655536c75..72af203e5fab 100644 --- a/core/java/android/view/accessibility/AccessibilityInteractionClient.java +++ b/core/java/android/view/accessibility/AccessibilityInteractionClient.java @@ -790,11 +790,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) { |