diff options
| author | 2018-10-08 09:51:48 -0700 | |
|---|---|---|
| committer | 2018-10-08 09:51:48 -0700 | |
| commit | 0cfa37911dd384a03bda3ac7e27f8196b153c54b (patch) | |
| tree | a724d178d9612f902d10f3f1364c20ce24a03e16 | |
| parent | 1a14cfb64dd142f3d485fec161b3c5c640938bda (diff) | |
Add mStatusBarWindowController null check on ACTION_SCREEN_OFF
Bug: 117401888
Test: Builds and manual verification
Change-Id: Id4e000588ad3dae97ed519da6d23b2c9a639cf0e
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index 90ed97f665d5..a7c43cdbf9c5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java @@ -2852,7 +2852,9 @@ public class StatusBar extends SystemUI implements DemoMode, } } else if (Intent.ACTION_SCREEN_OFF.equals(action)) { - mStatusBarWindowController.setNotTouchable(false); + if (mStatusBarWindowController != null) { + mStatusBarWindowController.setNotTouchable(false); + } finishBarAnimations(); resetUserExpandedStates(); } |