commit b5c5bb0df94d29dd1f96554da4b0663b2b6f3373
author Svetoslav <svetoslavganov@google.com> Tue Mar 04 02:00:06 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 04 02:00:07 2014 +0000
tree f7cf42f29cdc9e8a1e102efbc1602daa5685b5f3
parent 7b57d6162ea14a48970c32eebd83437a39cf7ef7
parent 375e23a6bcbe5a2560cd4d5fe0140f70949e0989

Merge "NPE in AccessibilityNodeInfoCahce."

core/java/android/view/accessibility/AccessibilityNodeInfoCache.java

diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java b/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java
index 645a9fa..b4944be 100644
--- a/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java
+++ b/core/java/android/view/accessibility/AccessibilityNodeInfoCache.java
@@ -174,11 +174,13 @@
                     // subtrees in the cache.
                     // TODO: Runs in O(n^2), could optimize to O(n + n log n)
                     final LongArray newChildrenIds = info.getChildNodeIds();
-                    final int oldChildCount = oldInfo.getChildCount();
-                    for (int i = 0; i < oldChildCount; i++) {
-                        final long oldChildId = oldInfo.getChildId(i);
-                        if (newChildrenIds.indexOf(oldChildId) < 0) {
-                            clearSubTreeLocked(oldChildId);
+                    if (newChildrenIds != null) {
+                        final int oldChildCount = oldInfo.getChildCount();
+                        for (int i = 0; i < oldChildCount; i++) {
+                            final long oldChildId = oldInfo.getChildId(i);
+                            if (newChildrenIds.indexOf(oldChildId) < 0) {
+                                clearSubTreeLocked(oldChildId);
+                            }
                         }
                     }