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

Commit 68000508 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 0bcfc537: Merge change 5386 into donut 

Merge commit '0bcfc537'

* commit '0bcfc537':
  Fixes #1940839. Prevents NPE in RelativeLayout when a non-existing View is
parents 7e89f8eb 0bcfc537

core/java/android/widget/RelativeLayout.java

+3 −0
Original line number Diff line number Diff line
@@ -1222,6 +1222,9 @@ public class RelativeLayout extends ViewGroup { 
                            throw new IllegalStateException("A view cannot have a dependency" +

                                    " on itself");

                        }

                        if (dependency == null) {

                            continue;

                        }

                        // Add the current node as a dependent

                        dependency.dependents.add(node);

                        // Add a dependency to the current node