From 78346e29d9c62555dff3de20729fd627e16b027e Mon Sep 17 00:00:00 2001 From: John Li Date: Thu, 9 Apr 2020 23:13:37 +0800 Subject: [PATCH] Change field type for reverse Bug: 145892579 Test: manual Change-Id: I91822b722818fbbd4dddcd219e8a7f0e159559e7 --- .../src/com/android/systemui/CarSystemUIModule.java | 5 ++--- .../android/systemui/dagger/SystemUIDefaultModule.java | 5 ++--- .../android/systemui/statusbar/phone/AutoTileManager.java | 8 ++++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java index c275536e4d92e..75a46807f4570 100644 --- a/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java +++ b/packages/CarSystemUI/src/com/android/systemui/CarSystemUIModule.java @@ -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); diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java index 8c572fe8f8426..7e5a3ae839287 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIDefaultModule.java @@ -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); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java index 0680c7f70b976..12ea1004038e8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/AutoTileManager.java @@ -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;