commit 0bcfc537e81b959a7d674deea4a5aee7f5c6eb2d
author Android (Google) Code Review <android-gerrit@google.com> Thu Jun 25 12:05:08 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 25 12:05:08 2009 -0700
tree 56099db8e921c51a690fda1d148130001b31c83d
parent 0d8b77c2453d0e597f94e39212e4bfeed8affffa
parent b8f8de85160b0a072158b45320e9fc2adba545f5

Merge change 5386 into donut

* changes:
  Fixes #1940839. Prevents NPE in RelativeLayout when a non-existing View is targeted.

core/java/android/widget/RelativeLayout.java

diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java
index 955475e4..44cf9a4 100644
--- a/core/java/android/widget/RelativeLayout.java
+++ b/core/java/android/widget/RelativeLayout.java
@@ -1222,6 +1222,9 @@
                             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