Merge "Clear out tuner prefs since it is disabled" into pi-dev (17e73888) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,7 @@ public class TunerServiceImpl extends TunerService {

	private static final String TUNER_VERSION = "sysui_tuner_version";		private static final String TUNER_VERSION = "sysui_tuner_version";

	private static final int CURRENT_TUNER_VERSION = 2;		private static final int CURRENT_TUNER_VERSION = 3;

	private final Observer mObserver = new Observer();		private final Observer mObserver = new Observer();
	// Map of Uris we listen on to their settings keys.		// Map of Uris we listen on to their settings keys.
	@@ -119,6 +119,10 @@ public class TunerServiceImpl extends TunerService {
	if (oldVersion < 2) {		if (oldVersion < 2) {
	setTunerEnabled(mContext, false);		setTunerEnabled(mContext, false);
	}		}
			if (oldVersion < 3) {
			// Delay this so that we can wait for everything to be registered first.
			new Handler(Dependency.get(Dependency.BG_LOOPER)).postDelayed(() -> clearAll(), 5000);
			}
	setValue(TUNER_VERSION, newVersion);		setValue(TUNER_VERSION, newVersion);
	}		}