Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Id13bc49327228989926c99f5598d0c8bd9f4d25b
This commit is contained in:
John Li
2020-04-11 00:50:41 +00:00
committed by Automerger Merge Worker
parent 2133af19dd ab61089e3b
commit 0f67dd3fca
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java
View File

@@ -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);

5
packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java
View File

@@ -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);

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

@@ -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;