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

Commit 55fb80e6 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Bind ConfigurationControllerStartable into SystemUIModule 

It was only bound in AOSP before this change.

Flag: NA
Fixes: 317847729
Test: m SystemUIGoogle
Change-Id: I785e5dcb27dffe035192a9dccb7d53cb83b6084c
parent be1761a0

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ import com.android.systemui.statusbar.notification.people.PeopleHubModule; 
import com.android.systemui.statusbar.notification.row.dagger.ExpandableNotificationRowComponent;

import com.android.systemui.statusbar.notification.row.dagger.NotificationRowComponent;

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

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

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

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

import com.android.systemui.statusbar.pipeline.dagger.StatusBarPipelineModule;
@@ -178,6 +179,7 @@ import javax.inject.Named; 
        ClockRegistryModule.class,

        CommunalModule.class,

        CommonDataLayerModule.class,

        ConfigurationControllerModule.class,

        ConnectivityModule.class,

        ControlsModule.class,

        CoroutinesModule.class,

packages/SystemUI/src/com/android/systemui/statusbar/phone/ConfigurationControllerModule.kt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.phone



import com.android.systemui.CoreStartable

import dagger.Binds

import dagger.Module

import dagger.multibindings.ClassKey

import dagger.multibindings.IntoMap



@Module

interface ConfigurationControllerModule {



    /** Starts [ConfigurationControllerStartable] */

    @Binds

    @IntoMap

    @ClassKey(ConfigurationControllerStartable::class)

    fun bindConfigControllerStartable(impl: ConfigurationControllerStartable): CoreStartable

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/dagger/StatusBarPhoneModule.java

+0 −12
Original line number Diff line number Diff line
@@ -16,16 +16,12 @@ 


package com.android.systemui.statusbar.phone.dagger;



import com.android.systemui.CoreStartable;

import com.android.systemui.dagger.SysUISingleton;

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

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

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



import dagger.Binds;

import dagger.Module;

import dagger.multibindings.ClassKey;

import dagger.multibindings.IntoMap;



/**

 * Dagger Module providing {@link CentralSurfacesImpl}.
@@ -38,12 +34,4 @@ public interface StatusBarPhoneModule { 
    @Binds

    @SysUISingleton

    CentralSurfaces bindsCentralSurfaces(CentralSurfacesImpl impl);



    /**

     * Starts {@link ConfigurationControllerStartable}

     */

    @Binds

    @IntoMap

    @ClassKey(ConfigurationControllerStartable.class)

    CoreStartable bindConfigControllerStartable(ConfigurationControllerStartable impl);

}