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

Commit a2bd707f authored by Lucy Chang's avatar Lucy Chang Committed by Android (Google) Code Review
Browse files

Merge "Checks viewId's nullibility before findA11yNodeInfos" into sc-dev

parents a5f26eb3 beebb734

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -50067,7 +50067,7 @@ package android.view.accessibility { 
    method public boolean canOpenPopup();

    method public int describeContents();

    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByText(String);

    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByViewId(String);

    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByViewId(@NonNull String);

    method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);

    method public android.view.accessibility.AccessibilityNodeInfo focusSearch(int);

    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> getActionList();

core/java/android/view/AccessibilityInteractionController.java

+2 −1
Original line number Diff line number Diff line
@@ -436,7 +436,8 @@ public final class AccessibilityInteractionController { 
        final List<AccessibilityNodeInfo> infos = mTempAccessibilityNodeInfoList;

        infos.clear();

        try {

            if (mViewRootImpl.mView == null || mViewRootImpl.mAttachInfo == null) {

            if (mViewRootImpl.mView == null || mViewRootImpl.mAttachInfo == null

                    || viewId == null) {

                return;

            }

            mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+5 −1
Original line number Diff line number Diff line
@@ -1781,8 +1781,12 @@ public class AccessibilityNodeInfo implements Parcelable { 
     * @param viewId The fully qualified resource name of the view id to find.

     * @return A list of node info.

     */

    public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByViewId(String viewId) {

    public List<AccessibilityNodeInfo> findAccessibilityNodeInfosByViewId(@NonNull String viewId) {

        enforceSealed();

        if (viewId == null) {

            Log.e(TAG, "returns empty list due to null viewId.");

            return Collections.emptyList();

        }

        if (!canPerformRequestOverConnection(mConnectionId, mWindowId, mSourceNodeId)) {

            return Collections.emptyList();

        }