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

Commit a31c03e7 authored by Daniel Peykov's avatar Daniel Peykov Committed by Automerger Merge Worker
Browse files

Merge "Fix potential NPE when dumping child nodes" into main am: 88a077b7 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3086546



Change-Id: Ie307ae36e634e791c4cce0a82659845b41d56330
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 63640e75 88a077b7

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;

    }