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

Commit ab61089e authored by John Li's avatar John Li Committed by Automerger Merge Worker
Browse files

Merge "Change field type for reverse" into rvc-d1-dev am: 24f5c7fa 

Change-Id: I63c150293854af76744995f03ff5d2264966784b
parents b00ab768 24f5c7fa

packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java

+2 −3
Original line number Diff line number Diff line
@@ -105,12 +105,11 @@ public abstract class CarSystemUIModule { 


    @Binds

    @Singleton

    public abstract BatteryController provideBatteryController(

            BatteryControllerImpl controllerImpl);

    public abstract BatteryController bindBatteryController(BatteryControllerImpl controllerImpl);



    @Binds

    @Singleton

    public abstract QSFactory provideQSFactory(QSFactoryImpl qsFactoryImpl);

    public abstract QSFactory bindQSFactory(QSFactoryImpl qsFactoryImpl);



    @Binds

    abstract DockManager bindDockManager(DockManagerImpl dockManager);

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

+2 −3
Original line number Diff line number Diff line
@@ -83,12 +83,11 @@ public abstract class SystemUIDefaultModule { 


    @Binds

    @Singleton

    public abstract BatteryController provideBatteryController(

            BatteryControllerImpl controllerImpl);

    public abstract BatteryController bindBatteryController(BatteryControllerImpl controllerImpl);



    @Binds

    @Singleton

    public abstract QSFactory provideQSFactory(QSFactoryImpl qsFactoryImpl);

    public abstract QSFactory bindQSFactory(QSFactoryImpl qsFactoryImpl);



    @Binds

    abstract DockManager bindDockManager(DockManagerImpl dockManager);

packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java

+4 −4
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ public class AutoTileManager { 
    public static final String NIGHT = "night";

    public static final String CAST = "cast";



    private final Context mContext;

    private final QSTileHost mHost;

    private final Handler mHandler;

    private final AutoAddTracker mAutoTracker;

    protected final Context mContext;

    protected final QSTileHost mHost;

    protected final Handler mHandler;

    protected final AutoAddTracker mAutoTracker;

    private final HotspotController mHotspotController;

    private final DataSaverController mDataSaverController;

    private final ManagedProfileController mManagedProfileController;