Merge "Fix bug 2888333"

2010-08-10 15:35:10 -07:00
parent 8a06cf708b 749b0eb2c9
commit 7c312bbd53
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/widget/PopupWindow.java
+++ b/core/java/android/widget/PopupWindow.java
@@ -122,7 +122,7 @@ public class PopupWindow {
    private OnScrollChangedListener mOnScrollChangedListener =
        new OnScrollChangedListener() {
            public void onScrollChanged() {
-                View anchor = mAnchor.get();
+                View anchor = mAnchor != null ? mAnchor.get() : null;
                if (anchor != null && mPopupView != null) {
                    WindowManager.LayoutParams p = (WindowManager.LayoutParams)
                            mPopupView.getLayoutParams();