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

am a0fd1d74: Fix NPE in RelativeLayout.

Browse Source 
Merge commit 'a0fd1d742d8edaf6c7e79bdd16a9b0c44fda4503'

* commit 'a0fd1d742d8edaf6c7e79bdd16a9b0c44fda4503':
  Fix NPE in RelativeLayout.
This commit is contained in:
Romain Guy
2009-06-24 15:45:27 -07:00
committed by The Android Open Source Project
parent 9f7b52adf7 a0fd1d742d
commit 6b21d36293
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) {
int id = rules[relation];
if (id != 0) {
View v = mGraph.mNodes.get(id).view;
if (v == null) {
return null;
}
DependencyGraph.Node node = mGraph.mNodes.get(id);
if (node == null) return null;
View v = node.view;
// Find the first non-GONE view up the chain
while (v.getVisibility() == View.GONE) {
rules = ((LayoutParams) v.getLayoutParams()).getRules();
v = mGraph.mNodes.get((rules[relation])).view;
if (v == null) {
return null;
}
node = mGraph.mNodes.get((rules[relation]));
if (node == null) return null;
v = node.view;
}
return v;