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

Merge "Fix bug 4021346 - crash while navigating" into honeycomb-mr1

Browse Source
This commit is contained in:
Adam Powell
2011-03-07 16:25:20 -08:00
committed by Android (Google) Code Review
parent ab7c3245ed 3ba8f5d675
commit a46c1df226
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/ViewGroup.java
View File

@@ -4275,11 +4275,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
* does not exist within the group
*/
public View getChildAt(int index) {
try {
return mChildren[index];
} catch (IndexOutOfBoundsException ex) {
if (index < 0 || index >= mChildrenCount) {
return null;
}
return mChildren[index];
}
/**

5
core/java/android/widget/ListView.java
View File

@@ -3019,12 +3019,13 @@ public class ListView extends AbsListView {
hasOpaqueScrollbars()) || super.isOpaque();
if (retValue) {
// only return true if the list items cover the entire area of the view
final int listTop = mListPadding.top;
final int listTop = mListPadding != null ? mListPadding.top : mPaddingTop;
View first = getChildAt(0);
if (first == null || first.getTop() > listTop) {
return false;
}
final int listBottom = getHeight() - mListPadding.bottom;
final int listBottom = getHeight() -
(mListPadding != null ? mListPadding.bottom : mPaddingBottom);
View last = getChildAt(getChildCount() - 1);
if (last == null || last.getBottom() < listBottom) {
return false;