Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 155168d7 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix signal cluster animation leak 

When subscription id's change during the animation, make sure to
clear them out as well. This happens when doing a network switch
on Fi.

Bug: 27434767
Change-Id: I9cbd65888419ca630e884c51d41a0d785237f35b
parent 65002e1d

packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java

+13 −0
Original line number Diff line number Diff line
@@ -295,6 +295,14 @@ public class SignalClusterView 
            return;

        }

        // Clear out all old subIds.

        for (PhoneState state : mPhoneStates) {

            if (state.mMobile != null) {

                state.maybeStopAnimatableDrawable(state.mMobile);

            }

            if (state.mMobileDark != null) {

                state.maybeStopAnimatableDrawable(state.mMobileDark);

            }

        }

        mPhoneStates.clear();

        if (mMobileSignalGroup != null) {

            mMobileSignalGroup.removeAllViews();
@@ -391,6 +399,11 @@ public class SignalClusterView 
                state.mMobile.setImageDrawable(null);

                state.mLastMobileStrengthId = -1;

            }

            if (state.mMobileDark != null) {

                state.maybeStopAnimatableDrawable(state.mMobileDark);

                state.mMobileDark.setImageDrawable(null);

                state.mLastMobileStrengthId = -1;

            }

            if (state.mMobileType != null) {

                state.mMobileType.setImageDrawable(null);

                state.mLastMobileTypeId = -1;