Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE in RelativeLayout.

Browse Source
This commit is contained in:
Romain Guy
2009-06-24 14:25:43 -07:00
parent e181409ced
commit a0fd1d742d
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/widget/RelativeLayout.java
View File

@@ -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;