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

Commit 377749e2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update SysUi dependency injection to allow for a null LocalBluetoothManager"

parents fe88a7d7 32cedc19

packages/CarSystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
         SystemUi b/c it can't be overlayed at this level for now

    -->

    <string-array name="config_systemUIServiceComponents" translatable="false">

        <item>com.android.systemui.Dependency</item>

        <item>com.android.systemui.Dependency$DependencyCreator</item>

        <item>com.android.systemui.util.NotificationChannels</item>

        <item>com.android.systemui.statusbar.CommandQueue$CommandQueueStart</item>

        <item>com.android.systemui.keyguard.KeyguardViewMediator</item>

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

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ public class Dependency extends SystemUI { 
    @Inject Lazy<FragmentService> mFragmentService;

    @Inject Lazy<ExtensionController> mExtensionController;

    @Inject Lazy<PluginDependencyProvider> mPluginDependencyProvider;

    @Nullable

    @Inject Lazy<LocalBluetoothManager> mLocalBluetoothManager;

    @Inject Lazy<VolumeDialogController> mVolumeDialogController;

    @Inject Lazy<MetricsLogger> mMetricsLogger;

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

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ public class DependencyProvider { 


    @Singleton

    @Provides

    @Nullable

    public LocalBluetoothManager provideLocalBluetoothController(Context context,

            @Named(BG_HANDLER_NAME) Handler bgHandler) {

        return LocalBluetoothManager.create(context, bgHandler,