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

* commit '9a786c251dab96f06a0800b4bad55f3ab839e234':
  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 ef2e70bd008e..36286909b717 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
@@ -627,9 +627,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