Merge "Clean up memory leak in volume dialog" (5cd75c80) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/volume/ConfigurableTexts.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,9 @@ public class ConfigurableTexts {

		public int add(final TextView text, final int labelResId) {
		if (text == null) return 0;
		if (mTexts.containsKey(text)) {
		return mTexts.get(text);
		}
		final Resources res = mContext.getResources();
		final float fontScale = res.getConfiguration().fontScale;
		final float density = res.getDisplayMetrics().density;
		@@ -63,6 +66,11 @@ public class ConfigurableTexts {
		return sp;
		}

		public void remove(final TextView text) {
		mTexts.remove(text);
		mTextLabels.remove(text);
		}

		public void update() {
		if (mTexts.isEmpty()) return;
		mTexts.keyAt(0).post(mUpdateAll);

+1 −0

Original line number	Diff line number	Diff line
		@@ -922,6 +922,7 @@ public class VolumeDialogImpl implements VolumeDialog,
		if (!mDynamic.get(row.stream)) {
		mRows.remove(i);
		mDialogRowsView.removeView(row.view);
		mConfigurableTexts.remove(row.header);
		}
		}
		}