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

Commit 1e968b8e authored by Jason Monk's avatar Jason Monk
Browse files

Remove Dependency.get usages from TunerServiceImpl 

Test: atest SystemUITests
Change-Id: I9567304e30cc61f7aeb4115da4993fc6af91cfd3
parent 00413cee

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

+11 −6
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.systemui.tuner;



import static com.android.systemui.Dependency.BG_HANDLER_NAME;



import android.app.ActivityManager;

import android.content.ContentResolver;

import android.content.Context;
@@ -33,7 +35,6 @@ import android.util.ArraySet; 


import com.android.internal.util.ArrayUtils;

import com.android.systemui.DemoMode;

import com.android.systemui.Dependency;

import com.android.systemui.qs.QSTileHost;

import com.android.systemui.settings.CurrentUserTracker;

import com.android.systemui.statusbar.phone.StatusBarIconController;
@@ -44,6 +45,7 @@ import java.util.HashSet; 
import java.util.Set;



import javax.inject.Inject;

import javax.inject.Named;

import javax.inject.Singleton;
@@ -71,6 +73,7 @@ public class TunerServiceImpl extends TunerService { 
    // Set of all tunables, used for leak detection.

    private final HashSet<Tunable> mTunables = LeakDetector.ENABLED ? new HashSet<>() : null;

    private final Context mContext;

    private final LeakDetector mLeakDetector;



    private ContentResolver mContentResolver;

    private int mCurrentUser;
@@ -79,14 +82,16 @@ public class TunerServiceImpl extends TunerService { 
    /**

     */

    @Inject

    public TunerServiceImpl(Context context) {

    public TunerServiceImpl(Context context, @Named(BG_HANDLER_NAME) Handler bgHandler,

            LeakDetector leakDetector) {

        mContext = context;

        mContentResolver = mContext.getContentResolver();

        mLeakDetector = leakDetector;



        for (UserInfo user : UserManager.get(mContext).getUsers()) {

            mCurrentUser = user.getUserHandle().getIdentifier();

            if (getValue(TUNER_VERSION, 0) != CURRENT_TUNER_VERSION) {

                upgradeTuner(getValue(TUNER_VERSION, 0), CURRENT_TUNER_VERSION);

                upgradeTuner(getValue(TUNER_VERSION, 0), CURRENT_TUNER_VERSION, bgHandler);

            }

        }
@@ -107,7 +112,7 @@ public class TunerServiceImpl extends TunerService { 
        mUserTracker.stopTracking();

    }



    private void upgradeTuner(int oldVersion, int newVersion) {

    private void upgradeTuner(int oldVersion, int newVersion, Handler bgHandler) {

        if (oldVersion < 1) {

            String blacklistStr = getValue(StatusBarIconController.ICON_BLACKLIST);

            if (blacklistStr != null) {
@@ -129,7 +134,7 @@ public class TunerServiceImpl extends TunerService { 
        if (oldVersion < 4) {

            // Delay this so that we can wait for everything to be registered first.

            final int user = mCurrentUser;

            new Handler(Dependency.get(Dependency.BG_LOOPER)).postDelayed(

            bgHandler.postDelayed(

                    () -> clearAllFromUser(user), 5000);

        }

        setValue(TUNER_VERSION, newVersion);
@@ -176,7 +181,7 @@ public class TunerServiceImpl extends TunerService { 
        mTunableLookup.get(key).add(tunable);

        if (LeakDetector.ENABLED) {

            mTunables.add(tunable);

            Dependency.get(LeakDetector.class).trackCollection(mTunables, "TunerService.mTunables");

            mLeakDetector.trackCollection(mTunables, "TunerService.mTunables");

        }

        Uri uri = Settings.Secure.getUriFor(key);

        if (!mListeningUris.containsKey(uri)) {