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
This commit is contained in:
Jorim Jaggi
2016-04-21 20:33:44 -07:00
parent 65002e1d17
commit 155168d704

View File

@@ -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;