am e8b92b6b: am 6c906dc5: Merge "Fix SystemUI crash on devices with WiFi only" into klp-dev

* commit 'e8b92b6bc32bbb0bcd34ffe2979771b4104bed67':
  Fix SystemUI crash on devices with WiFi only

1 files changed, 5 insertions, 3 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
index 6747d5027d00..e6823ac7d2ff 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
@@ -504,9 +504,11 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
     }
 
     void refreshRssiTile() {
-        // We reinflate the original view due to potential styling changes that may have
-        // taken place due to a configuration change.
-        mRSSITile.reinflateContent(LayoutInflater.from(mContext));
+        if (mRSSITile != null) {
+            // We reinflate the original view due to potential styling changes that may have
+            // taken place due to a configuration change.
+            mRSSITile.reinflateContent(LayoutInflater.from(mContext));
+        }
     }
 
     // Bluetooth