Merge "Fix bug 6596440: NPE when pulling down notification window" into jb-dev
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index ecdaa39..d40a763 100644
--- 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 @@
     }
 
     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;