Merge "[SettingsProvider] always destroy old tracker before inserting a new one" into main (b4f14c44) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -3583,6 +3583,12 @@ public final class Settings {
		+ " and user:" + userHandle
		+ " with index:" + index);
		}
		// Always make sure to close any pre-existing tracker before
		// replacing it, to prevent memory leaks
		var oldTracker = mGenerationTrackers.get(name);
		if (oldTracker != null) {
		oldTracker.destroy();
		}
		mGenerationTrackers.put(name, new GenerationTracker(name,
		array, index, generation,
		mGenerationTrackerErrorHandler));
		@@ -3805,6 +3811,12 @@ public final class Settings {
		+ " in package:" + cr.getPackageName()
		+ " with index:" + index);
		}
		// Always make sure to close any pre-existing tracker before
		// replacing it, to prevent memory leaks
		var oldTracker = mGenerationTrackers.get(prefix);
		if (oldTracker != null) {
		oldTracker.destroy();
		}
		mGenerationTrackers.put(prefix,
		new GenerationTracker(prefix, array, index, generation,
		mGenerationTrackerErrorHandler));