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

raphlinus · Android (Google) Code Review · commit 79f7381f8b4e · 2012-06-01T13:02:36.000-07:00
diff --git 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 void makeExpandedVisible() {
     }
 
     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;

Original file line number	Diff line number	Diff line change
`@@ -1054,6 +1054,9 @@ private void makeExpandedVisible() {`
`1054`	`1054`	`}`
`1055`	`1055`
`1056`	`1056`	`private static void makeSlippery(View view, boolean slippery) {`
	`1057`	`+ if (view == null) {`
	`1058`	`+ return;`
	`1059`	`+ }`
`1057`	`1060`	`WindowManager.LayoutParams lp = (WindowManager.LayoutParams) view.getLayoutParams();`
`1058`	`1061`	`if (slippery) {`
`1059`	`1062`	`lp.flags \|= WindowManager.LayoutParams.FLAG_SLIPPERY;`