Merge "Fix signal cluster animation leak" into nyc-dev (f934025e) · Commits · e / os / android_frameworks_base

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -299,6 +299,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();
		@@ -395,6 +403,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;