Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix: [SystemUI] icon_blacklist is not reset for sub users"

Browse Source
This commit is contained in:
Treehugger Robot
2018-08-09 14:30:17 +00:00
committed by Gerrit Code Review
parent 78f8ffbffd 3689663ca7
commit e8465e8480
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/tuner/TunerServiceImpl.java
View File

@@ -119,7 +119,9 @@ public class TunerServiceImpl extends TunerService {
// 3 Removed because of a revert. // 3 Removed because of a revert.
if (oldVersion < 4) { if (oldVersion < 4) {
// Delay this so that we can wait for everything to be registered first. // 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); setValue(TUNER_VERSION, newVersion);
} }
@@ -221,6 +223,10 @@ public class TunerServiceImpl extends TunerService {
@Override @Override
public void clearAll() { public void clearAll() {
clearAllFromUser(mCurrentUser);
}
public void clearAllFromUser(int user) {
// A couple special cases. // A couple special cases.
Settings.Global.putString(mContentResolver, DemoMode.DEMO_MODE_ALLOWED, null); Settings.Global.putString(mContentResolver, DemoMode.DEMO_MODE_ALLOWED, null);
Intent intent = new Intent(DemoMode.ACTION_DEMO); Intent intent = new Intent(DemoMode.ACTION_DEMO);
@@ -231,7 +237,7 @@ public class TunerServiceImpl extends TunerService {
if (ArrayUtils.contains(RESET_BLACKLIST, key)) { if (ArrayUtils.contains(RESET_BLACKLIST, key)) {
continue; continue;
} }
Settings.Secure.putString(mContentResolver, key, null); Settings.Secure.putStringForUser(mContentResolver, key, null, user);
} }
} }