Merge changes from topic "b196625757-operator-name-view" into sc-v2-dev am: ebf67700c6 am: fbd417afef

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15586189

Change-Id: Icc6cdd58df63fecfc6c1576c80bd5c2c0fe89bcb
This commit is contained in:
Dave Mankoff
2021-08-18 03:07:27 +00:00
committed by Automerger Merge Worker

View File

@@ -115,7 +115,6 @@ import com.android.systemui.statusbar.policy.FlashlightController;
import com.android.systemui.statusbar.policy.HotspotController;
import com.android.systemui.statusbar.policy.KeyguardStateController;
import com.android.systemui.statusbar.policy.LocationController;
import com.android.systemui.statusbar.policy.NetworkController;
import com.android.systemui.statusbar.policy.NextAlarmController;
import com.android.systemui.statusbar.policy.RemoteInputQuickSettingsDisabler;
import com.android.systemui.statusbar.policy.RotationLockController;
@@ -245,7 +244,6 @@ public class Dependency {
@Inject Lazy<BluetoothController> mBluetoothController;
@Inject Lazy<LocationController> mLocationController;
@Inject Lazy<RotationLockController> mRotationLockController;
@Inject Lazy<NetworkController> mNetworkController;
@Inject Lazy<ZenModeController> mZenModeController;
@Inject Lazy<HotspotController> mHotspotController;
@Inject Lazy<CastController> mCastController;
@@ -391,8 +389,6 @@ public class Dependency {
mProviders.put(RotationLockController.class, mRotationLockController::get);
mProviders.put(NetworkController.class, mNetworkController::get);
mProviders.put(ZenModeController.class, mZenModeController::get);
mProviders.put(HotspotController.class, mHotspotController::get);