From 3689663ca710410e7a23f59b6a9c93c74c5ecac8 Mon Sep 17 00:00:00 2001 From: Tetsutoki Shiozawa Date: Tue, 17 Jul 2018 15:22:49 +0900 Subject: Fix: [SystemUI] icon_blacklist is not reset for sub users Symptom: System icon tuner preference is removed at P-osv but icon_blacklist setting remains for sub users. There is no way to reveal the hidden icons. Bug: 111575893 Change-Id: I5174657048c24e5f85bbf2bb936a97a51262eee5 --- .../src/com/android/systemui/tuner/TunerServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'packages/SystemUI/src') diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java index 1bdb7ad3c3fc..196d9bc32e75 100644 --- a/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java +++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java @@ -119,7 +119,9 @@ public class TunerServiceImpl extends TunerService { // 3 Removed because of a revert. if (oldVersion < 4) { // Delay this so that we can wait for everything to be registered first. - new Handler(Dependency.get(Dependency.BG_LOOPER)).postDelayed(() -> clearAll(), 5000); + final int user = mCurrentUser; + new Handler(Dependency.get(Dependency.BG_LOOPER)).postDelayed( + () -> clearAllFromUser(user), 5000); } setValue(TUNER_VERSION, newVersion); } @@ -221,6 +223,10 @@ public class TunerServiceImpl extends TunerService { @Override public void clearAll() { + clearAllFromUser(mCurrentUser); + } + + public void clearAllFromUser(int user) { // A couple special cases. Settings.Global.putString(mContentResolver, DemoMode.DEMO_MODE_ALLOWED, null); Intent intent = new Intent(DemoMode.ACTION_DEMO); @@ -231,7 +237,7 @@ public class TunerServiceImpl extends TunerService { if (ArrayUtils.contains(RESET_BLACKLIST, key)) { continue; } - Settings.Secure.putString(mContentResolver, key, null); + Settings.Secure.putStringForUser(mContentResolver, key, null, user); } } -- cgit v1.2.3-59-g8ed1b