diff options
| author | Romain Guy <romainguy@android.com> | 2009-06-25 12:03:56 -0700 |
|---|---|---|
| committer | Romain Guy <romainguy@android.com> | 2009-06-25 12:03:56 -0700 |
| commit | b8f8de85160b0a072158b45320e9fc2adba545f5 (patch) | |
| tree | 8b2bd8b7e90428c720e20aeead04c2de8a7c7be5 /core/java/android/widget | |
| parent | 69e1f472c33e241f729c470285a5680866ede75c (diff) | |
| download | frameworks_base-b8f8de85160b0a072158b45320e9fc2adba545f5.zip frameworks_base-b8f8de85160b0a072158b45320e9fc2adba545f5.tar.gz frameworks_base-b8f8de85160b0a072158b45320e9fc2adba545f5.tar.bz2 | |
Fixes #1940839. Prevents NPE in RelativeLayout when a non-existing View is
targeted.
Diffstat (limited to 'core/java/android/widget')
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 955475e..44cf9a4 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 |