From b8f8de85160b0a072158b45320e9fc2adba545f5 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Thu, 25 Jun 2009 12:03:56 -0700 Subject: [PATCH] Fixes #1940839. Prevents NPE in RelativeLayout when a non-existing View is targeted. --- core/java/android/widget/RelativeLayout.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 955475e401ff9..44cf9a41c40ca 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -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