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

Commit add84343 authored by Daniel Norman's avatar Daniel Norman Committed by Automerger Merge Worker
Browse files

Merge "Fix the problem that AccessibilityNodeInfo maybe null and cause a... 

Merge "Fix the problem that AccessibilityNodeInfo maybe null and cause a crash." am: 27c5bed4 am: 5404eb28 am: 26d940d5

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



Change-Id: I1d2040cf3f49b3fa2e3de069a0ce799e5ebb642f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents df93f450 26d940d5

core/java/android/view/View.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -9323,8 +9323,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            final AccessibilityNodeInfo info = createAccessibilityNodeInfo();

            final AccessibilityNodeInfo info = createAccessibilityNodeInfo();

            structure.setChildCount(1);

            structure.setChildCount(1);

            final ViewStructure root = structure.newChild(0);

            final ViewStructure root = structure.newChild(0);

            if (info != null) {

                populateVirtualStructure(root, provider, info, forAutofill);

                populateVirtualStructure(root, provider, info, forAutofill);

                info.recycle();

                info.recycle();

            } else {

                Log.w(AUTOFILL_LOG_TAG, "AccessibilityNodeInfo is null.");

            }

        }

        }

    }

    }