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

Commit 6b21d362 authored by Romain Guy's avatar Romain Guy Committed by The Android Open Source Project
Browse files

am a0fd1d74: Fix NPE in RelativeLayout. 

Merge commit 'a0fd1d74'

* commit 'a0fd1d74':
  Fix NPE in RelativeLayout.
parents 9f7b52ad a0fd1d74

core/java/android/widget/RelativeLayout.java

+6 −8
Original line number Diff line number Diff line
@@ -764,18 +764,16 @@ public class RelativeLayout extends ViewGroup { 
    private View getRelatedView(int[] rules, int relation) {

        int id = rules[relation];

        if (id != 0) {

            View v = mGraph.mNodes.get(id).view;

            if (v == null) {

                return null;

            }

            DependencyGraph.Node node = mGraph.mNodes.get(id);

            if (node == null) return null;

            View v = node.view;



            // Find the first non-GONE view up the chain

            while (v.getVisibility() == View.GONE) {

                rules = ((LayoutParams) v.getLayoutParams()).getRules();

                v = mGraph.mNodes.get((rules[relation])).view;

                if (v == null) {

                    return null;

                }

                node = mGraph.mNodes.get((rules[relation]));

                if (node == null) return null;

                v = node.view;

            }



            return v;