commit cbea0a76c62a8052fee3d5f735657f8959737b9e
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 03 19:37:28 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 03 19:37:28 2018 +0000
tree c3a9e0df3841a2fafeffbd193dac6bc62562d945
parent 16ae4cd2ef3327f1a27669168cf6e4b66e388881
parent d9839562ee70a5c5f6f05a372db1420991683418

Merge "null check on qspanel before called method on it." into pi-dev

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

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 750d2a5..f7a97be 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -1425,11 +1425,15 @@
     }
 
     public void addQsTile(ComponentName tile) {
-        mQSPanel.getHost().addTile(tile);
+        if (mQSPanel.getHost() != null) {
+            mQSPanel.getHost().addTile(tile);
+        }
     }
 
     public void remQsTile(ComponentName tile) {
-        mQSPanel.getHost().removeTile(tile);
+        if (mQSPanel.getHost() != null) {
+            mQSPanel.getHost().removeTile(tile);
+        }
     }
 
     public void clickTile(ComponentName tile) {