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

Merge change 4374 into donut

Browse Source 
* changes:
  Fixes a potential NPE in View.
This commit is contained in:
Android (Google) Code Review
2009-06-16 15:04:37 -07:00
parent febde5fc29 779398e7eb
commit 8ad473994d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/View.java
View File

@@ -7157,9 +7157,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
getLocationInWindow(location); getLocationInWindow(location);
final AttachInfo info = mAttachInfo; final AttachInfo info = mAttachInfo;
if (info != null) {
location[0] += info.mWindowLeft; location[0] += info.mWindowLeft;
location[1] += info.mWindowTop; location[1] += info.mWindowTop;
} }
}
/** /**
* <p>Computes the coordinates of this view in its window. The argument * <p>Computes the coordinates of this view in its window. The argument