diff options
| author | Raph Levien <raph@google.com> | 2012-06-01 13:02:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-01 13:02:36 -0700 |
| commit | 79f7381f8b4e9a462d012740c2a902ae3de8a6b0 (patch) | |
| tree | de6e736fac90a924791f21c3cbb852e1293cc313 /packages/SystemUI/src | |
| parent | 40ba4dad4c56b8a7fbae4a93a6e5385993301ad4 (diff) | |
| parent | 311a961a9a9f29d365954302202e27b82853485a (diff) | |
| download | frameworks_base-79f7381f8b4e9a462d012740c2a902ae3de8a6b0.zip frameworks_base-79f7381f8b4e9a462d012740c2a902ae3de8a6b0.tar.gz frameworks_base-79f7381f8b4e9a462d012740c2a902ae3de8a6b0.tar.bz2 | |
Merge "Fix bug 6596440: NPE when pulling down notification window" into jb-dev
Diffstat (limited to 'packages/SystemUI/src')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ 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; |