Merge "Fix bug 6596440: NPE when pulling down notification window" into jb-dev

2012-06-01 13:02:36 -07:00
parent 40ba4dad4c 311a961a9a
commit 79f7381f8b
1 changed files with 3 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1054,6 +1054,9 @@ public class PhoneStatusBar extends BaseStatusBar {
    }

    private static void makeSlippery(View view, boolean slippery) {
+        if (view == null) {
+            return;
+        }
        WindowManager.LayoutParams lp = (WindowManager.LayoutParams) view.getLayoutParams();
        if (slippery) {
            lp.flags |= WindowManager.LayoutParams.FLAG_SLIPPERY;