Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 248c44b9 authored by Jason Monk's avatar Jason Monk
Browse files

Revert "Revert "Clear out tuner prefs since it is disabled"" 

Now without wiping user settings!

This reverts commit a3e5552c.

Test: build, push, see QS tiles not reset
Fixes: 74851117
Change-Id: I34c98da2d96f5d4f0774acf106a80a7b27391ca7
parent 8819dc86

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

+17 −13
Original line number Diff line number Diff line
@@ -16,21 +16,14 @@ 
package com.android.systemui.tuner;



import android.app.ActivityManager;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;

import android.content.DialogInterface;

import android.content.DialogInterface.OnClickListener;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.pm.UserInfo;

import android.database.ContentObserver;

import android.net.Uri;

import android.os.Handler;

import android.os.Looper;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.Settings.Secure;
@@ -38,15 +31,12 @@ import android.text.TextUtils; 
import android.util.ArrayMap;

import android.util.ArraySet;



import com.android.internal.util.ArrayUtils;

import com.android.systemui.DemoMode;

import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.SysUiServiceProvider;

import com.android.systemui.SystemUI;

import com.android.systemui.SystemUIApplication;

import com.android.systemui.qs.QSTileHost;

import com.android.systemui.settings.CurrentUserTracker;

import com.android.systemui.statusbar.phone.StatusBarIconController;

import com.android.systemui.statusbar.phone.SystemUIDialog;

import com.android.systemui.util.leak.LeakDetector;



import java.util.HashMap;
@@ -58,7 +48,13 @@ 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 = 4;



    // Things that use the tunable infrastructure but are now real user settings and

    // shouldn't be reset with tuner settings.

    private static final String[] RESET_BLACKLIST = new String[] {

            QSTileHost.TILES_SETTING,

    };



    private final Observer mObserver = new Observer();

    // Map of Uris we listen on to their settings keys.
@@ -119,6 +115,11 @@ public class TunerServiceImpl extends TunerService { 
        if (oldVersion < 2) {

            setTunerEnabled(mContext, false);

        }

        // 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);

        }

        setValue(TUNER_VERSION, newVersion);

    }
@@ -226,6 +227,9 @@ public class TunerServiceImpl extends TunerService { 
        mContext.sendBroadcast(intent);



        for (String key : mTunableLookup.keySet()) {

            if (ArrayUtils.contains(RESET_BLACKLIST, key)) {

                continue;

            }

            Settings.Secure.putString(mContentResolver, key, null);

        }

    }