Avoid casting network traffic to StatusBarIconView to prevent crash

SpiritCroc · RiteshSaxena · commit 84bce6b521aa · 2020-07-20T12:43:59.000Z
Change-Id: Ib7dab59daec436f91a7c9d213583feb52f3d2b21
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarIconController.java
@@ -360,8 +360,10 @@ protected void onRemoveIcon(int viewIndex) {
         }
 
         public void onSetIcon(int viewIndex, StatusBarIcon icon) {
-            StatusBarIconView view = (StatusBarIconView) mGroup.getChildAt(viewIndex);
-            view.set(icon);
+            View view = mGroup.getChildAt(viewIndex);
+            if (view instanceof StatusBarIconView) {
+                ((StatusBarIconView) view).set(icon);
+            }
         }
 
         public void onSetIconHolder(int viewIndex, StatusBarIconHolder holder) {

Original file line number	Diff line number	Diff line change
`@@ -360,8 +360,10 @@ protected void onRemoveIcon(int viewIndex) {`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`public void onSetIcon(int viewIndex, StatusBarIcon icon) {`
`363`		`- StatusBarIconView view = (StatusBarIconView) mGroup.getChildAt(viewIndex);`
`364`		`- view.set(icon);`
	`363`	`+ View view = mGroup.getChildAt(viewIndex);`
	`364`	`+ if (view instanceof StatusBarIconView) {`
	`365`	`+ ((StatusBarIconView) view).set(icon);`
	`366`	`+ }`
`365`	`367`	`}`
`366`	`368`
`367`	`369`	`public void onSetIconHolder(int viewIndex, StatusBarIconHolder holder) {`