Merge "Check whether qsIcon is null before using it"

2021-01-22 18:54:55 +00:00
parent 8b444c2c01 0e87f757ca
commit 5cde6cbcbe
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java
@@ -274,7 +274,8 @@ public class CastTile extends QSTileImpl<BooleanState> {
                        NetworkController.IconState qsIcon, boolean activityIn, boolean activityOut,
                        String description, boolean isTransient, String statusLabel) {
                    // statusIcon.visible has the connected status information
-                    boolean enabledAndConnected = enabled && qsIcon.visible;
+                    boolean enabledAndConnected =
+                            enabled && (qsIcon == null ? false : qsIcon.visible);
                    if (enabledAndConnected != mWifiConnected) {
                        mWifiConnected = enabledAndConnected;
                        // Hotspot is not connected, so changes here should update