From 8bb9bbf152e35cdb4263aa1132827d51eb57e8b4 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Tue, 10 Apr 2018 14:39:47 -0400 Subject: [PATCH] Clear out tuner prefs since it is disabled Test: manual Change-Id: Iff383557761fee92e37de4c4f3fcc10cff333299 Fixes: 74851117 --- .../src/com/android/systemui/tuner/TunerServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java index 5a4478f072e00..639e49b1a17f2 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java @@ -58,7 +58,7 @@ public class TunerServiceImpl extends TunerService { 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(); // Map of Uris we listen on to their settings keys. @@ -119,6 +119,10 @@ public class TunerServiceImpl extends TunerService { if (oldVersion < 2) { 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); }