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

Commit a0fd1d74 authored by Romain Guy's avatar Romain Guy
Browse files

Fix NPE in RelativeLayout.

parent e181409c

core/java/android/widget/RelativeLayout.java

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

    private View getRelatedView(int[] rules, int relation) {

        int id = rules[relation];

        int id = rules[relation];

        if (id != 0) {

        if (id != 0) {

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

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

            if (v == null) {

            if (node == null) return null;

                return null;

            View v = node.view;

            }





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

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

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

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

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

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

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

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

                if (v == null) {

                if (node == null) return null;

                    return null;

                v = node.view;

                }

            }

            }





            return v;

            return v;