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

Commit 00413cee authored by Jason Monk's avatar Jason Monk
Browse files

Remove Dependency.get usages from GarbageMonitor 

Test: atest SystemUITests
Change-Id: Ic3631b6ef49c43a3d31a393a82a287bc71be8e87
parent 0d4da83e

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+4 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import com.android.systemui.statusbar.phone.StatusBarIconController; 
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

import com.android.systemui.statusbar.policy.DeviceProvisionedController;

import com.android.systemui.util.InjectionInflationController;

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

import com.android.systemui.volume.VolumeDialogComponent;



import java.util.function.Consumer;
@@ -237,5 +238,8 @@ public class SystemUIFactory { 
         * ViewCreator generates all Views that need injection.

         */

        InjectionInflationController.ViewCreator createViewCreator();



        @Singleton

        GarbageMonitor createGarbageMonitor();

    }

}

packages/SystemUI/src/com/android/systemui/util/leak/GarbageMonitor.java

+4 −3
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ import android.text.format.DateUtils; 
import android.util.Log;

import android.util.LongSparseArray;



import com.android.systemui.Dependency;

import com.android.systemui.R;

import com.android.systemui.SystemUI;

import com.android.systemui.SystemUIFactory;

import com.android.systemui.plugins.qs.QSTile;

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.tileimpl.QSTileImpl;
@@ -348,7 +348,7 @@ public class GarbageMonitor { 


        public MemoryTile(QSHost host) {

            super(host);

            gm = Dependency.get(GarbageMonitor.class);

            gm = SystemUIFactory.getInstance().getRootComponent().createGarbageMonitor();

        }



        @Override
@@ -453,7 +453,8 @@ public class GarbageMonitor { 
                    Settings.Secure.getInt(

                                    mContext.getContentResolver(), FORCE_ENABLE_LEAK_REPORTING, 0)

                            != 0;

            mGarbageMonitor = Dependency.get(GarbageMonitor.class);

            mGarbageMonitor = SystemUIFactory.getInstance().getRootComponent()

                   .createGarbageMonitor();

            if (LEAK_REPORTING_ENABLED || forceEnable) {

                mGarbageMonitor.startLeakMonitor();

            }