Revert "Add an @Inject-able MobileSignalControllerFactory"
Revert submission 19279477
Reason for revert: b/240223150
Reverted Changes:
I1bef3f309:Remove support for COMBINED_SIGNAL_ICONS
I38f76a746:Create a MobileStatusTrackerFactory
I0b1dd8e71:Change from deprecated telephony api
Id1a02134f:[Cleanup] Order NetworkController's intent filters...
I405ad3858:Add an @Inject-able MobileSignalControllerFactory
Change-Id: Ic004e4164580d19914912e6fb8d8951cd075f9e9
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalControllerFactory.kt b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalControllerFactory.kt
deleted file mode 100644
index fa13330..0000000
--- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/MobileSignalControllerFactory.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2022 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.connectivity
-
-import android.content.Context
-import android.os.Looper
-import android.telephony.SubscriptionInfo
-import android.telephony.TelephonyManager
-import com.android.settingslib.mobile.MobileMappings
-import com.android.settingslib.mobile.MobileStatusTracker
-import com.android.systemui.flags.FeatureFlags
-import com.android.systemui.util.CarrierConfigTracker
-import javax.inject.Inject
-
-/**
- * Factory to make MobileSignalController injectable
- */
-internal class MobileSignalControllerFactory @Inject constructor(
- val context: Context,
- val callbackHandler: CallbackHandler,
- val carrierConfigTracker: CarrierConfigTracker,
- val featureFlags: FeatureFlags,
-) {
- fun createMobileSignalController(
- config: MobileMappings.Config,
- hasMobileData: Boolean,
- phone: TelephonyManager,
- networkController: NetworkControllerImpl, // TODO: no!
- subscriptionInfo: SubscriptionInfo,
- subscriptionDefaults: MobileStatusTracker.SubscriptionDefaults,
- receiverLooper: Looper // TODO: no!
- ): MobileSignalController {
- return MobileSignalController(
- context,
- config,
- hasMobileData,
- phone,
- callbackHandler,
- networkController,
- subscriptionInfo,
- subscriptionDefaults,
- receiverLooper,
- carrierConfigTracker,
- featureFlags,
- )
- }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java
index 8a84ba1..a1dc7b4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/connectivity/NetworkControllerImpl.java
@@ -140,7 +140,6 @@
private final FeatureFlags mFeatureFlags;
private final DumpManager mDumpManager;
private final LogBuffer mLogBuffer;
- private final MobileSignalControllerFactory mMobileFactory;
private TelephonyCallback.ActiveDataSubscriptionIdListener mPhoneStateListener;
private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
@@ -236,7 +235,6 @@
DemoModeController demoModeController,
CarrierConfigTracker carrierConfigTracker,
WifiStatusTrackerFactory trackerFactory,
- MobileSignalControllerFactory mobileFactory,
@Main Handler handler,
InternetDialogFactory internetDialogFactory,
FeatureFlags featureFlags,
@@ -259,7 +257,6 @@
demoModeController,
carrierConfigTracker,
trackerFactory,
- mobileFactory,
handler,
featureFlags,
dumpManager,
@@ -286,7 +283,6 @@
DemoModeController demoModeController,
CarrierConfigTracker carrierConfigTracker,
WifiStatusTrackerFactory trackerFactory,
- MobileSignalControllerFactory mobileFactory,
@Main Handler handler,
FeatureFlags featureFlags,
DumpManager dumpManager,
@@ -302,7 +298,6 @@
mCallbackHandler = callbackHandler;
mDataSaverController = new DataSaverControllerImpl(context);
mBroadcastDispatcher = broadcastDispatcher;
- mMobileFactory = mobileFactory;
mSubscriptionManager = subManager;
mSubDefaults = defaultsHandler;
@@ -987,15 +982,11 @@
mMobileSignalControllers.put(subId, cachedControllers.get(subId));
cachedControllers.remove(subId);
} else {
- MobileSignalController controller = mMobileFactory.createMobileSignalController(
- mConfig,
- mHasMobileDataFeature,
- mPhone.createForSubscriptionId(subId),
- this,
- subscriptions.get(i),
- mSubDefaults,
- mReceiverHandler.getLooper()
- );
+ MobileSignalController controller = new MobileSignalController(mContext, mConfig,
+ mHasMobileDataFeature, mPhone.createForSubscriptionId(subId),
+ mCallbackHandler, this, subscriptions.get(i),
+ mSubDefaults, mReceiverHandler.getLooper(), mCarrierConfigTracker,
+ mFeatureFlags);
controller.setUserSetupComplete(mUserSetup);
mMobileSignalControllers.put(subId, controller);
if (subscriptions.get(i).getSimSlotIndex() == 0) {
@@ -1356,7 +1347,7 @@
mMobileSignalControllers.clear();
int start = mSubscriptionManager.getActiveSubscriptionInfoCountMax();
for (int i = start /* get out of normal index range */; i < start + num; i++) {
- subs.add(addDemoModeSignalController(i, i));
+ subs.add(addSignalController(i, i));
}
mCallbackHandler.setSubs(subs);
for (int i = 0; i < mMobileSignalControllers.size(); i++) {
@@ -1382,7 +1373,7 @@
List<SubscriptionInfo> subs = new ArrayList<>();
while (mMobileSignalControllers.size() <= slot) {
int nextSlot = mMobileSignalControllers.size();
- subs.add(addDemoModeSignalController(nextSlot, nextSlot));
+ subs.add(addSignalController(nextSlot, nextSlot));
}
if (!subs.isEmpty()) {
mCallbackHandler.setSubs(subs);
@@ -1472,20 +1463,14 @@
mHistoryIndex = (mHistoryIndex + 1) % HISTORY_SIZE;
}
- private SubscriptionInfo addDemoModeSignalController(int id, int simSlotIndex) {
+ private SubscriptionInfo addSignalController(int id, int simSlotIndex) {
SubscriptionInfo info = new SubscriptionInfo(id, "", simSlotIndex, "", "", 0, 0, "", 0,
null, null, null, "", false, null, null);
-
- MobileSignalController controller = mMobileFactory.createMobileSignalController(
- mConfig,
- mHasMobileDataFeature,
- mPhone.createForSubscriptionId(info.getSubscriptionId()),
- this,
- info,
- mSubDefaults,
- mReceiverHandler.getLooper()
- );
-
+ MobileSignalController controller = new MobileSignalController(mContext,
+ mConfig, mHasMobileDataFeature,
+ mPhone.createForSubscriptionId(info.getSubscriptionId()), mCallbackHandler, this,
+ info, mSubDefaults, mReceiverHandler.getLooper(), mCarrierConfigTracker,
+ mFeatureFlags);
mMobileSignalControllers.put(id, controller);
controller.getState().userSetup = true;
return info;
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java
index 8808502..0d1879c 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerBaseTest.java
@@ -129,7 +129,6 @@
protected Handler mMainHandler;
protected FeatureFlags mFeatureFlags;
protected WifiStatusTrackerFactory mWifiStatusTrackerFactory;
- protected MobileSignalControllerFactory mMobileFactory;
protected int mSubId;
@@ -225,12 +224,6 @@
mWifiStatusTrackerFactory = new WifiStatusTrackerFactory(
mContext, mMockWm, mMockNsm, mMockCm, mMainHandler);
- mMobileFactory = new MobileSignalControllerFactory(
- mContext,
- mCallbackHandler,
- mCarrierConfigTracker,
- mFeatureFlags
- );
mNetworkController = new NetworkControllerImpl(mContext,
mMockCm,
@@ -250,7 +243,6 @@
mDemoModeController,
mCarrierConfigTracker,
mWifiStatusTrackerFactory,
- mMobileFactory,
mMainHandler,
mFeatureFlags,
mock(DumpManager.class),
@@ -645,4 +637,5 @@
protected void assertDataNetworkNameEquals(String expected) {
assertEquals("Data network name", expected, mNetworkController.getMobileDataNetworkName());
}
+
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java
index f3edef4..e3dd6f4 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerDataTest.java
@@ -145,7 +145,6 @@
mDemoModeController,
mock(CarrierConfigTracker.class),
mWifiStatusTrackerFactory,
- mMobileFactory,
new Handler(TestableLooper.get(this).getLooper()),
mFeatureFlags,
mock(DumpManager.class),
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java
index f60b6d1..698899a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/connectivity/NetworkControllerSignalTest.java
@@ -85,7 +85,6 @@
mDemoModeController,
mCarrierConfigTracker,
mWifiStatusTrackerFactory,
- mMobileFactory,
mMainHandler,
mFeatureFlags,
mock(DumpManager.class),
@@ -122,7 +121,6 @@
mDemoModeController,
mCarrierConfigTracker,
mWifiStatusTrackerFactory,
- mMobileFactory,
mMainHandler,
mFeatureFlags,
mock(DumpManager.class),
@@ -157,7 +155,6 @@
mDemoModeController,
mock(CarrierConfigTracker.class),
mWifiStatusTrackerFactory,
- mMobileFactory,
mMainHandler,
mFeatureFlags,
mock(DumpManager.class),
@@ -195,7 +192,6 @@
mDemoModeController,
mock(CarrierConfigTracker.class),
mWifiStatusTrackerFactory,
- mMobileFactory,
mMainHandler,
mFeatureFlags,
mock(DumpManager.class),
@@ -281,7 +277,6 @@
mDemoModeController,
mock(CarrierConfigTracker.class),
mWifiStatusTrackerFactory,
- mMobileFactory,
mMainHandler,
mFeatureFlags,
mock(DumpManager.class),