Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c3f6981 authored by Daniel Peykov's avatar Daniel Peykov
Browse files

Fix potential NPE when dumping child nodes 

* This brings the childNafCheck method in line with the version in
  androidx.test.uiautomator.

Bug: 315023780
Test: manual
Change-Id: Ie5ba2340bedabc31f346c6e717353c7a5db0e90e
parent 400a6e0c

cmds/uiautomator/library/core-src/com/android/uiautomator/core/AccessibilityNodeInfoDumper.java

+7 −3
Original line number Diff line number Diff line
@@ -292,14 +292,18 @@ public class AccessibilityNodeInfoDumper { 
        int childCount = node.getChildCount();

        for (int x = 0; x < childCount; x++) {

            AccessibilityNodeInfo childNode = node.getChild(x);



            if (childNode == null) {

                continue;

            }

            if (!safeCharSeqToString(childNode.getContentDescription()).isEmpty()

                    || !safeCharSeqToString(childNode.getText()).isEmpty())

                    || !safeCharSeqToString(childNode.getText()).isEmpty()) {

                return true;

            }



            if (childNafCheck(childNode))

            if (childNafCheck(childNode)) {

                return true;

            }

        }

        return false;

    }