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

Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev

Browse Source
This commit is contained in:
Alan Viverette
2015-08-26 20:38:53 +00:00
committed by Android (Google) Code Review
parent e4c3ff2f50 898c7045e0
commit 9513785715
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/widget/AdapterView.java
View File

@@ -612,7 +612,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {
View listItem = view; View listItem = view;
try { try {
View v; View v;
while (!(v = (View) listItem.getParent()).equals(this)) { while ((v = (View) listItem.getParent()) != null && !v.equals(this)) {
listItem = v; listItem = v;
} }
} catch (ClassCastException e) { } catch (ClassCastException e) {
@@ -620,6 +620,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {
return INVALID_POSITION; return INVALID_POSITION;
} }
if (listItem != null) {
// Search the children for the list item // Search the children for the list item
final int childCount = getChildCount(); final int childCount = getChildCount();
for (int i = 0; i < childCount; i++) { for (int i = 0; i < childCount; i++) {
@@ -627,6 +628,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup {
return mFirstPosition + i; return mFirstPosition + i;
} }
} }
}
// Child not found! // Child not found!
return INVALID_POSITION; return INVALID_POSITION;