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

Commit 97be51d4 authored by Nikolas Havrikov's avatar Nikolas Havrikov
Browse files

Remove unused injections from Dependency.java 

The Dependency singleton is deprecated and much work has been done to
remove references to it. However, we can already begin shrinking its
footprint on the class coupling by removing those dependencies which are
no longer requested through its get methods.

This has the effect of allowing R8 to strip out more unused code.
For example, consider the following size changes:
TvSystemUI.apk 17258477 -> 16991318
SystemUI.apk 24691539 -> 24683347
CarSystemUI.apk.apk 41085858 -> 41040802
SystemUIGo.apk 24477590 -> 24461206
SystemUIGoogle.apk 30211518 -> 30198346

Bug: 297828369
Test: builds
Change-Id: I82730872943b72564895dcd7090a1fe4b04c8e9c
parent c41764f9

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

+0 −322
Original line number Original line Diff line number Diff line
@@ -15,123 +15,55 @@ 
package com.android.systemui;

package com.android.systemui;





import android.annotation.Nullable;

import android.annotation.Nullable;

import android.app.AlarmManager;

import android.app.INotificationManager;

import android.app.IWallpaperManager;

import android.hardware.SensorPrivacyManager;

import android.hardware.display.NightDisplayListener;

import android.os.Handler;

import android.os.Handler;

import android.os.Looper;

import android.os.Looper;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.DisplayMetrics;

import android.view.IWindowManager;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.statusbar.IStatusBarService;

import com.android.internal.util.Preconditions;

import com.android.internal.util.Preconditions;

import com.android.keyguard.KeyguardSecurityModel;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.keyguard.KeyguardUpdateMonitor;

import com.android.settingslib.bluetooth.LocalBluetoothManager;

import com.android.systemui.accessibility.AccessibilityButtonModeObserver;

import com.android.systemui.accessibility.AccessibilityButtonModeObserver;

import com.android.systemui.accessibility.AccessibilityButtonTargetsObserver;

import com.android.systemui.accessibility.AccessibilityButtonTargetsObserver;

import com.android.systemui.accessibility.floatingmenu.AccessibilityFloatingMenuController;

import com.android.systemui.animation.DialogLaunchAnimator;

import com.android.systemui.animation.DialogLaunchAnimator;

import com.android.systemui.appops.AppOpsController;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.assist.AssistManager;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.broadcast.BroadcastDispatcher;

import com.android.systemui.colorextraction.SysuiColorExtractor;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.fragments.FragmentService;

import com.android.systemui.fragments.FragmentService;

import com.android.systemui.keyguard.ScreenLifecycle;

import com.android.systemui.keyguard.WakefulnessLifecycle;

import com.android.systemui.media.dialog.MediaOutputDialogFactory;

import com.android.systemui.model.SysUiState;

import com.android.systemui.model.SysUiState;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.NavigationBarController;

import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.navigationbar.NavigationModeController;

import com.android.systemui.navigationbar.gestural.EdgeBackGestureHandler;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.DarkIconDispatcher;

import com.android.systemui.plugins.DarkIconDispatcher;

import com.android.systemui.plugins.PluginDependencyProvider;

import com.android.systemui.plugins.PluginManager;

import com.android.systemui.plugins.PluginManager;

import com.android.systemui.plugins.VolumeDialogController;

import com.android.systemui.plugins.VolumeDialogController;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.power.EnhancedEstimates;

import com.android.systemui.power.PowerUI;

import com.android.systemui.privacy.PrivacyItemController;

import com.android.systemui.qs.ReduceBrightColorsController;

import com.android.systemui.qs.tiles.dialog.InternetDialogFactory;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.recents.OverviewProxyService;

import com.android.systemui.screenrecord.RecordingController;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.DevicePolicyManagerWrapper;

import com.android.systemui.shared.system.PackageManagerWrapper;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationListener;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationMediaManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationRemoteInputManager;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.SmartReplyController;

import com.android.systemui.statusbar.VibratorHelper;

import com.android.systemui.statusbar.events.PrivacyDotViewController;

import com.android.systemui.statusbar.events.SystemStatusAnimationScheduler;

import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager;

import com.android.systemui.statusbar.notification.collection.render.GroupExpansionManager;

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

import com.android.systemui.statusbar.notification.logging.NotificationLogger;

import com.android.systemui.statusbar.notification.stack.AmbientState;

import com.android.systemui.statusbar.notification.stack.AmbientState;

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager;

import com.android.systemui.statusbar.notification.stack.NotificationSectionsManager;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

import com.android.systemui.statusbar.window.StatusBarWindowController;

import com.android.systemui.telephony.TelephonyListenerManager;

import com.android.systemui.tuner.TunablePadding.TunablePaddingService;

import com.android.systemui.tuner.TunablePadding.TunablePaddingService;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.tuner.TunerService;

import com.android.systemui.util.DeviceConfigProxy;

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

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

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

import com.android.systemui.util.sensors.AsyncSensorManager;





import dagger.Lazy;

import dagger.Lazy;





import java.util.concurrent.Executor;

import java.util.function.Consumer;

import java.util.function.Consumer;





import javax.inject.Inject;

import javax.inject.Inject;
@@ -154,10 +86,6 @@ import javax.inject.Named; 
 */

 */

@SysUISingleton

@SysUISingleton

public class Dependency {

public class Dependency {

    /**

     * Key for getting a the main looper.

     */

    private static final String MAIN_LOOPER_NAME = "main_looper";





    /**

    /**

     * Key for getting a background Looper for background work.

     * Key for getting a background Looper for background work.
@@ -171,15 +99,6 @@ public class Dependency { 
     * Generic handler on the main thread.

     * Generic handler on the main thread.

     */

     */

    private static final String MAIN_HANDLER_NAME = "main_handler";

    private static final String MAIN_HANDLER_NAME = "main_handler";

    /**

     * Generic executor on the main thread.

     */

    private static final String MAIN_EXECUTOR_NAME = "main_executor";



    /**

     * Generic executor on a background thread.

     */

    private static final String BACKGROUND_EXECUTOR_NAME = "background_executor";





    /**

    /**

     * An email address to send memory leak reports to by default.

     * An email address to send memory leak reports to by default.
@@ -196,10 +115,6 @@ public class Dependency { 
     * Key for getting a background Looper for background work.

     * Key for getting a background Looper for background work.

     */

     */

    public static final DependencyKey<Looper> BG_LOOPER = new DependencyKey<>(BG_LOOPER_NAME);

    public static final DependencyKey<Looper> BG_LOOPER = new DependencyKey<>(BG_LOOPER_NAME);

    /**

     * Key for getting a mainer Looper.

     */

    public static final DependencyKey<Looper> MAIN_LOOPER = new DependencyKey<>(MAIN_LOOPER_NAME);

    /**

    /**

     * Key for getting a Handler for receiving time tick broadcasts on.

     * Key for getting a Handler for receiving time tick broadcasts on.

     */

     */
@@ -211,133 +126,43 @@ public class Dependency { 
    public static final DependencyKey<Handler> MAIN_HANDLER =

    public static final DependencyKey<Handler> MAIN_HANDLER =

            new DependencyKey<>(MAIN_HANDLER_NAME);

            new DependencyKey<>(MAIN_HANDLER_NAME);





    /**

     * Generic executor on the main thread.

     */

    public static final DependencyKey<Executor> MAIN_EXECUTOR =

            new DependencyKey<>(MAIN_EXECUTOR_NAME);

    /**

     * Generic executor on a background thread.

     */

    public static final DependencyKey<Executor> BACKGROUND_EXECUTOR =

            new DependencyKey<>(BACKGROUND_EXECUTOR_NAME);



    /**

     * An email address to send memory leak reports to by default.

     */

    public static final DependencyKey<String> LEAK_REPORT_EMAIL =

            new DependencyKey<>(LEAK_REPORT_EMAIL_NAME);



    private final ArrayMap<Object, Object> mDependencies = new ArrayMap<>();

    private final ArrayMap<Object, Object> mDependencies = new ArrayMap<>();

    private final ArrayMap<Object, LazyDependencyCreator> mProviders = new ArrayMap<>();

    private final ArrayMap<Object, LazyDependencyCreator> mProviders = new ArrayMap<>();





    @Inject DumpManager mDumpManager;

    @Inject DumpManager mDumpManager;





    @Inject Lazy<ActivityStarter> mActivityStarter;

    @Inject Lazy<BroadcastDispatcher> mBroadcastDispatcher;

    @Inject Lazy<BroadcastDispatcher> mBroadcastDispatcher;

    @Inject Lazy<AsyncSensorManager> mAsyncSensorManager;

    @Inject Lazy<BluetoothController> mBluetoothController;

    @Inject Lazy<BluetoothController> mBluetoothController;

    @Inject Lazy<LocationController> mLocationController;

    @Inject Lazy<RotationLockController> mRotationLockController;

    @Inject Lazy<ZenModeController> mZenModeController;

    @Inject Lazy<HotspotController> mHotspotController;

    @Inject Lazy<CastController> mCastController;

    @Inject Lazy<FlashlightController> mFlashlightController;

    @Inject Lazy<FlashlightController> mFlashlightController;

    @Inject Lazy<UserSwitcherController> mUserSwitcherController;

    @Inject Lazy<UserInfoController> mUserInfoController;

    @Inject Lazy<KeyguardStateController> mKeyguardMonitor;

    @Inject Lazy<KeyguardUpdateMonitor> mKeyguardUpdateMonitor;

    @Inject Lazy<KeyguardUpdateMonitor> mKeyguardUpdateMonitor;

    @Inject Lazy<NightDisplayListener> mNightDisplayListener;

    @Inject Lazy<ReduceBrightColorsController> mReduceBrightColorsController;

    @Inject Lazy<ManagedProfileController> mManagedProfileController;

    @Inject Lazy<NextAlarmController> mNextAlarmController;

    @Inject Lazy<DataSaverController> mDataSaverController;

    @Inject Lazy<AccessibilityController> mAccessibilityController;

    @Inject Lazy<DeviceProvisionedController> mDeviceProvisionedController;

    @Inject Lazy<DeviceProvisionedController> mDeviceProvisionedController;

    @Inject Lazy<PluginManager> mPluginManager;

    @Inject Lazy<PluginManager> mPluginManager;

    @Inject Lazy<AssistManager> mAssistManager;

    @Inject Lazy<AssistManager> mAssistManager;

    @Inject Lazy<SecurityController> mSecurityController;

    @Inject Lazy<LeakDetector> mLeakDetector;

    @Inject Lazy<LeakReporter> mLeakReporter;

    @Inject Lazy<GarbageMonitor> mGarbageMonitor;

    @Inject Lazy<TunerService> mTunerService;

    @Inject Lazy<TunerService> mTunerService;

    @Inject Lazy<NotificationShadeWindowController> mNotificationShadeWindowController;

    @Inject Lazy<StatusBarWindowController> mTempStatusBarWindowController;

    @Inject Lazy<DarkIconDispatcher> mDarkIconDispatcher;

    @Inject Lazy<DarkIconDispatcher> mDarkIconDispatcher;

    @Inject Lazy<StatusBarIconController> mStatusBarIconController;

    @Inject Lazy<ScreenLifecycle> mScreenLifecycle;

    @Inject Lazy<WakefulnessLifecycle> mWakefulnessLifecycle;

    @Inject Lazy<FragmentService> mFragmentService;

    @Inject Lazy<FragmentService> mFragmentService;

    @Inject Lazy<ExtensionController> mExtensionController;

    @Inject Lazy<PluginDependencyProvider> mPluginDependencyProvider;

    @Nullable

    @Nullable

    @Inject Lazy<LocalBluetoothManager> mLocalBluetoothManager;

    @Inject Lazy<VolumeDialogController> mVolumeDialogController;

    @Inject Lazy<VolumeDialogController> mVolumeDialogController;

    @Inject Lazy<MetricsLogger> mMetricsLogger;

    @Inject Lazy<MetricsLogger> mMetricsLogger;

    @Inject Lazy<AccessibilityManagerWrapper> mAccessibilityManagerWrapper;

    @Inject Lazy<SysuiColorExtractor> mSysuiColorExtractor;

    @Inject Lazy<TunablePaddingService> mTunablePaddingService;

    @Inject Lazy<TunablePaddingService> mTunablePaddingService;

    @Inject Lazy<UiOffloadThread> mUiOffloadThread;

    @Inject Lazy<UiOffloadThread> mUiOffloadThread;

    @Inject Lazy<PowerUI.WarningsUI> mWarningsUI;

    @Inject Lazy<LightBarController> mLightBarController;

    @Inject Lazy<LightBarController> mLightBarController;

    @Inject Lazy<IWindowManager> mIWindowManager;

    @Inject Lazy<OverviewProxyService> mOverviewProxyService;

    @Inject Lazy<OverviewProxyService> mOverviewProxyService;

    @Inject Lazy<NavigationModeController> mNavBarModeController;

    @Inject Lazy<NavigationModeController> mNavBarModeController;

    @Inject Lazy<AccessibilityButtonModeObserver> mAccessibilityButtonModeObserver;

    @Inject Lazy<AccessibilityButtonModeObserver> mAccessibilityButtonModeObserver;

    @Inject Lazy<AccessibilityButtonTargetsObserver> mAccessibilityButtonListController;

    @Inject Lazy<AccessibilityButtonTargetsObserver> mAccessibilityButtonListController;

    @Inject Lazy<EnhancedEstimates> mEnhancedEstimates;

    @Inject Lazy<VibratorHelper> mVibratorHelper;

    @Inject Lazy<IStatusBarService> mIStatusBarService;

    @Inject Lazy<IStatusBarService> mIStatusBarService;

    @Inject Lazy<DisplayMetrics> mDisplayMetrics;

    @Inject Lazy<LockscreenGestureLogger> mLockscreenGestureLogger;

    @Inject Lazy<ShadeController> mShadeController;

    @Inject Lazy<NotificationRemoteInputManager.Callback> mNotificationRemoteInputManagerCallback;

    @Inject Lazy<NotificationRemoteInputManager.Callback> mNotificationRemoteInputManagerCallback;

    @Inject Lazy<AppOpsController> mAppOpsController;

    @Inject Lazy<NavigationBarController> mNavigationBarController;

    @Inject Lazy<NavigationBarController> mNavigationBarController;

    @Inject Lazy<AccessibilityFloatingMenuController> mAccessibilityFloatingMenuController;

    @Inject Lazy<StatusBarStateController> mStatusBarStateController;

    @Inject Lazy<StatusBarStateController> mStatusBarStateController;

    @Inject Lazy<NotificationLockscreenUserManager> mNotificationLockscreenUserManager;

    @Inject Lazy<NotificationMediaManager> mNotificationMediaManager;

    @Inject Lazy<NotificationMediaManager> mNotificationMediaManager;

    @Inject Lazy<NotificationRemoteInputManager> mNotificationRemoteInputManager;

    @Inject Lazy<SmartReplyConstants> mSmartReplyConstants;

    @Inject Lazy<NotificationListener> mNotificationListener;

    @Inject Lazy<NotificationLogger> mNotificationLogger;

    @Inject Lazy<KeyguardDismissUtil> mKeyguardDismissUtil;

    @Inject Lazy<SmartReplyController> mSmartReplyController;

    @Inject Lazy<RemoteInputQuickSettingsDisabler> mRemoteInputQuickSettingsDisabler;

    @Inject Lazy<SensorPrivacyManager> mSensorPrivacyManager;

    @Inject Lazy<AutoHideController> mAutoHideController;

    @Inject Lazy<PrivacyItemController> mPrivacyItemController;

    @Inject @Background Lazy<Looper> mBgLooper;

    @Inject @Background Lazy<Looper> mBgLooper;

    @Inject @Background Lazy<Handler> mBgHandler;

    @Inject @Main Lazy<Looper> mMainLooper;

    @Inject @Main Lazy<Handler> mMainHandler;

    @Inject @Main Lazy<Handler> mMainHandler;

    @Inject @Named(TIME_TICK_HANDLER_NAME) Lazy<Handler> mTimeTickHandler;

    @Inject @Named(TIME_TICK_HANDLER_NAME) Lazy<Handler> mTimeTickHandler;

    @Inject @Named(LEAK_REPORT_EMAIL_NAME) Lazy<String> mLeakReportEmail;

    @Inject @Main Lazy<Executor> mMainExecutor;

    @Inject @Background Lazy<Executor> mBackgroundExecutor;

    @Inject Lazy<ActivityManagerWrapper> mActivityManagerWrapper;

    @Inject Lazy<DevicePolicyManagerWrapper> mDevicePolicyManagerWrapper;

    @Inject Lazy<PackageManagerWrapper> mPackageManagerWrapper;

    @Inject Lazy<SensorPrivacyController> mSensorPrivacyController;

    @Inject Lazy<DockManager> mDockManager;

    @Inject Lazy<INotificationManager> mINotificationManager;

    @Inject Lazy<SysUiState> mSysUiStateFlagsContainer;

    @Inject Lazy<SysUiState> mSysUiStateFlagsContainer;

    @Inject Lazy<AlarmManager> mAlarmManager;

    @Inject Lazy<KeyguardSecurityModel> mKeyguardSecurityModel;

    @Inject Lazy<DozeParameters> mDozeParameters;

    @Inject Lazy<IWallpaperManager> mWallpaperManager;

    @Inject Lazy<CommandQueue> mCommandQueue;

    @Inject Lazy<CommandQueue> mCommandQueue;

    @Inject Lazy<RecordingController> mRecordingController;

    @Inject Lazy<MediaOutputDialogFactory> mMediaOutputDialogFactory;

    @Inject Lazy<DeviceConfigProxy> mDeviceConfigProxy;

    @Inject Lazy<TelephonyListenerManager> mTelephonyListenerManager;

    @Inject Lazy<SystemStatusAnimationScheduler> mSystemStatusAnimationSchedulerLazy;

    @Inject Lazy<PrivacyDotViewController> mPrivacyDotViewControllerLazy;

    @Inject Lazy<EdgeBackGestureHandler.Factory> mEdgeBackGestureHandlerFactoryLazy;

    @Inject Lazy<UiEventLogger> mUiEventLogger;

    @Inject Lazy<UiEventLogger> mUiEventLogger;

    @Inject Lazy<StatusBarContentInsetsProvider> mContentInsetsProviderLazy;

    @Inject Lazy<StatusBarContentInsetsProvider> mContentInsetsProviderLazy;

    @Inject Lazy<InternetDialogFactory> mInternetDialogFactory;

    @Inject Lazy<FeatureFlags> mFeatureFlagsLazy;

    @Inject Lazy<FeatureFlags> mFeatureFlagsLazy;

    @Inject Lazy<NotificationSectionsManager> mNotificationSectionsManagerLazy;

    @Inject Lazy<NotificationSectionsManager> mNotificationSectionsManagerLazy;

    @Inject Lazy<ScreenOffAnimationController> mScreenOffAnimationController;

    @Inject Lazy<ScreenOffAnimationController> mScreenOffAnimationController;
@@ -360,183 +185,36 @@ public class Dependency { 
        // on imports.

        // on imports.

        mProviders.put(TIME_TICK_HANDLER, mTimeTickHandler::get);

        mProviders.put(TIME_TICK_HANDLER, mTimeTickHandler::get);

        mProviders.put(BG_LOOPER, mBgLooper::get);

        mProviders.put(BG_LOOPER, mBgLooper::get);

        mProviders.put(MAIN_LOOPER, mMainLooper::get);

        mProviders.put(MAIN_HANDLER, mMainHandler::get);

        mProviders.put(MAIN_HANDLER, mMainHandler::get);

        mProviders.put(MAIN_EXECUTOR, mMainExecutor::get);

        mProviders.put(BACKGROUND_EXECUTOR, mBackgroundExecutor::get);

        mProviders.put(ActivityStarter.class, mActivityStarter::get);

        mProviders.put(BroadcastDispatcher.class, mBroadcastDispatcher::get);

        mProviders.put(BroadcastDispatcher.class, mBroadcastDispatcher::get);



        mProviders.put(AsyncSensorManager.class, mAsyncSensorManager::get);



        mProviders.put(BluetoothController.class, mBluetoothController::get);

        mProviders.put(BluetoothController.class, mBluetoothController::get);

        mProviders.put(SensorPrivacyManager.class, mSensorPrivacyManager::get);



        mProviders.put(LocationController.class, mLocationController::get);



        mProviders.put(RotationLockController.class, mRotationLockController::get);



        mProviders.put(ZenModeController.class, mZenModeController::get);



        mProviders.put(HotspotController.class, mHotspotController::get);



        mProviders.put(CastController.class, mCastController::get);



        mProviders.put(FlashlightController.class, mFlashlightController::get);

        mProviders.put(FlashlightController.class, mFlashlightController::get);



        mProviders.put(KeyguardStateController.class, mKeyguardMonitor::get);



        mProviders.put(KeyguardUpdateMonitor.class, mKeyguardUpdateMonitor::get);

        mProviders.put(KeyguardUpdateMonitor.class, mKeyguardUpdateMonitor::get);



        mProviders.put(UserSwitcherController.class, mUserSwitcherController::get);



        mProviders.put(UserInfoController.class, mUserInfoController::get);



        mProviders.put(NightDisplayListener.class, mNightDisplayListener::get);



        mProviders.put(ReduceBrightColorsController.class, mReduceBrightColorsController::get);



        mProviders.put(ManagedProfileController.class, mManagedProfileController::get);



        mProviders.put(NextAlarmController.class, mNextAlarmController::get);



        mProviders.put(DataSaverController.class, mDataSaverController::get);



        mProviders.put(AccessibilityController.class, mAccessibilityController::get);



        mProviders.put(DeviceProvisionedController.class, mDeviceProvisionedController::get);

        mProviders.put(DeviceProvisionedController.class, mDeviceProvisionedController::get);



        mProviders.put(PluginManager.class, mPluginManager::get);

        mProviders.put(PluginManager.class, mPluginManager::get);



        mProviders.put(AssistManager.class, mAssistManager::get);

        mProviders.put(AssistManager.class, mAssistManager::get);



        mProviders.put(SecurityController.class, mSecurityController::get);



        mProviders.put(LeakDetector.class, mLeakDetector::get);



        mProviders.put(LEAK_REPORT_EMAIL, mLeakReportEmail::get);



        mProviders.put(LeakReporter.class, mLeakReporter::get);



        mProviders.put(GarbageMonitor.class, mGarbageMonitor::get);



        mProviders.put(TunerService.class, mTunerService::get);

        mProviders.put(TunerService.class, mTunerService::get);



        mProviders.put(NotificationShadeWindowController.class,

                mNotificationShadeWindowController::get);



        mProviders.put(StatusBarWindowController.class, mTempStatusBarWindowController::get);



        mProviders.put(DarkIconDispatcher.class, mDarkIconDispatcher::get);

        mProviders.put(DarkIconDispatcher.class, mDarkIconDispatcher::get);



        mProviders.put(StatusBarIconController.class, mStatusBarIconController::get);



        mProviders.put(ScreenLifecycle.class, mScreenLifecycle::get);



        mProviders.put(WakefulnessLifecycle.class, mWakefulnessLifecycle::get);



        mProviders.put(FragmentService.class, mFragmentService::get);

        mProviders.put(FragmentService.class, mFragmentService::get);



        mProviders.put(ExtensionController.class, mExtensionController::get);



        mProviders.put(PluginDependencyProvider.class, mPluginDependencyProvider::get);



        mProviders.put(LocalBluetoothManager.class, mLocalBluetoothManager::get);



        mProviders.put(VolumeDialogController.class, mVolumeDialogController::get);

        mProviders.put(VolumeDialogController.class, mVolumeDialogController::get);



        mProviders.put(MetricsLogger.class, mMetricsLogger::get);

        mProviders.put(MetricsLogger.class, mMetricsLogger::get);



        mProviders.put(AccessibilityManagerWrapper.class, mAccessibilityManagerWrapper::get);



        mProviders.put(SysuiColorExtractor.class, mSysuiColorExtractor::get);



        mProviders.put(TunablePaddingService.class, mTunablePaddingService::get);

        mProviders.put(TunablePaddingService.class, mTunablePaddingService::get);



        mProviders.put(UiOffloadThread.class, mUiOffloadThread::get);

        mProviders.put(UiOffloadThread.class, mUiOffloadThread::get);



        mProviders.put(PowerUI.WarningsUI.class, mWarningsUI::get);



        mProviders.put(LightBarController.class, mLightBarController::get);

        mProviders.put(LightBarController.class, mLightBarController::get);



        mProviders.put(IWindowManager.class, mIWindowManager::get);



        mProviders.put(OverviewProxyService.class, mOverviewProxyService::get);

        mProviders.put(OverviewProxyService.class, mOverviewProxyService::get);



        mProviders.put(NavigationModeController.class, mNavBarModeController::get);

        mProviders.put(NavigationModeController.class, mNavBarModeController::get);



        mProviders.put(AccessibilityButtonModeObserver.class,

        mProviders.put(AccessibilityButtonModeObserver.class,

                mAccessibilityButtonModeObserver::get);

                mAccessibilityButtonModeObserver::get);

        mProviders.put(AccessibilityButtonTargetsObserver.class,

        mProviders.put(AccessibilityButtonTargetsObserver.class,

                mAccessibilityButtonListController::get);

                mAccessibilityButtonListController::get);



        mProviders.put(EnhancedEstimates.class, mEnhancedEstimates::get);



        mProviders.put(VibratorHelper.class, mVibratorHelper::get);



        mProviders.put(IStatusBarService.class, mIStatusBarService::get);

        mProviders.put(IStatusBarService.class, mIStatusBarService::get);



        mProviders.put(DisplayMetrics.class, mDisplayMetrics::get);



        mProviders.put(LockscreenGestureLogger.class, mLockscreenGestureLogger::get);



        mProviders.put(ShadeController.class, mShadeController::get);



        mProviders.put(NotificationRemoteInputManager.Callback.class,

        mProviders.put(NotificationRemoteInputManager.Callback.class,

                mNotificationRemoteInputManagerCallback::get);

                mNotificationRemoteInputManagerCallback::get);



        mProviders.put(AppOpsController.class, mAppOpsController::get);



        mProviders.put(NavigationBarController.class, mNavigationBarController::get);

        mProviders.put(NavigationBarController.class, mNavigationBarController::get);



        mProviders.put(AccessibilityFloatingMenuController.class,

                mAccessibilityFloatingMenuController::get);



        mProviders.put(StatusBarStateController.class, mStatusBarStateController::get);

        mProviders.put(StatusBarStateController.class, mStatusBarStateController::get);

        mProviders.put(NotificationLockscreenUserManager.class,

                mNotificationLockscreenUserManager::get);

        mProviders.put(NotificationMediaManager.class, mNotificationMediaManager::get);

        mProviders.put(NotificationMediaManager.class, mNotificationMediaManager::get);

        mProviders.put(NotificationRemoteInputManager.class,

                mNotificationRemoteInputManager::get);

        mProviders.put(SmartReplyConstants.class, mSmartReplyConstants::get);

        mProviders.put(NotificationListener.class, mNotificationListener::get);

        mProviders.put(NotificationLogger.class, mNotificationLogger::get);

        mProviders.put(KeyguardDismissUtil.class, mKeyguardDismissUtil::get);

        mProviders.put(SmartReplyController.class, mSmartReplyController::get);

        mProviders.put(RemoteInputQuickSettingsDisabler.class,

                mRemoteInputQuickSettingsDisabler::get);

        mProviders.put(PrivacyItemController.class, mPrivacyItemController::get);

        mProviders.put(ActivityManagerWrapper.class, mActivityManagerWrapper::get);

        mProviders.put(DevicePolicyManagerWrapper.class, mDevicePolicyManagerWrapper::get);

        mProviders.put(PackageManagerWrapper.class, mPackageManagerWrapper::get);

        mProviders.put(SensorPrivacyController.class, mSensorPrivacyController::get);

        mProviders.put(DockManager.class, mDockManager::get);

        mProviders.put(INotificationManager.class, mINotificationManager::get);

        mProviders.put(SysUiState.class, mSysUiStateFlagsContainer::get);

        mProviders.put(SysUiState.class, mSysUiStateFlagsContainer::get);

        mProviders.put(AlarmManager.class, mAlarmManager::get);

        mProviders.put(KeyguardSecurityModel.class, mKeyguardSecurityModel::get);

        mProviders.put(DozeParameters.class, mDozeParameters::get);

        mProviders.put(IWallpaperManager.class, mWallpaperManager::get);

        mProviders.put(CommandQueue.class, mCommandQueue::get);

        mProviders.put(CommandQueue.class, mCommandQueue::get);

        mProviders.put(DeviceConfigProxy.class, mDeviceConfigProxy::get);

        mProviders.put(TelephonyListenerManager.class, mTelephonyListenerManager::get);



        // TODO(b/118592525): to support multi-display , we start to add something which is

        //                    per-display, while others may be global. I think it's time to add

        //                    a new class maybe named DisplayDependency to solve per-display

        //                    Dependency problem.

        mProviders.put(AutoHideController.class, mAutoHideController::get);



        mProviders.put(RecordingController.class, mRecordingController::get);



        mProviders.put(MediaOutputDialogFactory.class, mMediaOutputDialogFactory::get);



        mProviders.put(SystemStatusAnimationScheduler.class,

                mSystemStatusAnimationSchedulerLazy::get);

        mProviders.put(PrivacyDotViewController.class, mPrivacyDotViewControllerLazy::get);

        mProviders.put(InternetDialogFactory.class, mInternetDialogFactory::get);

        mProviders.put(EdgeBackGestureHandler.Factory.class,

                mEdgeBackGestureHandlerFactoryLazy::get);

        mProviders.put(UiEventLogger.class, mUiEventLogger::get);

        mProviders.put(UiEventLogger.class, mUiEventLogger::get);

        mProviders.put(FeatureFlags.class, mFeatureFlagsLazy::get);

        mProviders.put(FeatureFlags.class, mFeatureFlagsLazy::get);

        mProviders.put(StatusBarContentInsetsProvider.class, mContentInsetsProviderLazy::get);

        mProviders.put(StatusBarContentInsetsProvider.class, mContentInsetsProviderLazy::get);