Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev (def23772) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkControllerImpl.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ import com.android.systemui.dagger.SysUISingleton;
		import com.android.systemui.dagger.qualifiers.Background;
		import com.android.systemui.demomode.DemoMode;
		import com.android.systemui.demomode.DemoModeController;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.settings.CurrentUserTracker;
		import com.android.systemui.statusbar.FeatureFlags;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
		@@ -126,6 +127,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		private Config mConfig;
		private final CarrierConfigTracker mCarrierConfigTracker;
		private final FeatureFlags mFeatureFlags;
		private final DumpManager mDumpManager;

		private TelephonyCallback.ActiveDataSubscriptionIdListener mPhoneStateListener;
		private int mActiveMobileDataSubscription = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		@@ -218,7 +220,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
		AccessPointControllerImpl accessPointController,
		DemoModeController demoModeController,
		CarrierConfigTracker carrierConfigTracker,
		FeatureFlags featureFlags) {
		FeatureFlags featureFlags,
		DumpManager dumpManager) {
		this(context, connectivityManager,
		telephonyManager,
		telephonyListenerManager,
		@@ -236,7 +239,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
		broadcastDispatcher,
		demoModeController,
		carrierConfigTracker,
		featureFlags);
		featureFlags,
		dumpManager);
		mReceiverHandler.post(mRegisterListeners);
		}

		@@ -256,7 +260,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
		BroadcastDispatcher broadcastDispatcher,
		DemoModeController demoModeController,
		CarrierConfigTracker carrierConfigTracker,
		FeatureFlags featureFlags
		FeatureFlags featureFlags,
		DumpManager dumpManager
		) {
		mContext = context;
		mTelephonyListenerManager = telephonyListenerManager;
		@@ -275,6 +280,7 @@ public class NetworkControllerImpl extends BroadcastReceiver
		mDemoModeController = demoModeController;
		mCarrierConfigTracker = carrierConfigTracker;
		mFeatureFlags = featureFlags;
		mDumpManager = dumpManager;

		// telephony
		mPhone = telephonyManager;
		@@ -425,6 +431,8 @@ public class NetworkControllerImpl extends BroadcastReceiver
		mDemoModeController.addCallback(this);
		mProviderModelBehavior = mFeatureFlags.isCombinedStatusBarSignalIconsEnabled();
		mProviderModelSetting = mFeatureFlags.isProviderModelSettingEnabled();

		mDumpManager.registerDumpable(TAG, this);
		}

		private final Runnable mClearForceValidated = () -> {

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerBaseTest.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ import com.android.settingslib.net.DataUsageController;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.broadcast.BroadcastDispatcher;
		import com.android.systemui.demomode.DemoModeController;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.statusbar.FeatureFlags;
		import com.android.systemui.statusbar.policy.DeviceProvisionedController.DeviceProvisionedListener;
		import com.android.systemui.statusbar.policy.NetworkController.IconState;
		@@ -241,7 +242,9 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
		mMockBd,
		mDemoModeController,
		mCarrierConfigTracker,
		mFeatureFlags);
		mFeatureFlags,
		mock(DumpManager.class)
		);
		setupNetworkController();

		// Trigger blank callbacks to always get the current state (some tests don't trigger
		@@ -309,7 +312,8 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
		mock(AccessPointControllerImpl.class),
		mock(DataUsageController.class), mMockSubDefaults,
		mock(DeviceProvisionedController.class), mMockBd, mDemoModeController,
		mCarrierConfigTracker, mFeatureFlags);
		mCarrierConfigTracker, mFeatureFlags,
		mock(DumpManager.class));

		setupNetworkController();

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerDataTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ import android.testing.TestableLooper.RunWithLooper;

		import com.android.settingslib.mobile.TelephonyIcons;
		import com.android.settingslib.net.DataUsageController;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.util.CarrierConfigTracker;

		import org.junit.Test;
		@@ -113,7 +114,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
		mock(AccessPointControllerImpl.class),
		mock(DataUsageController.class), mMockSubDefaults,
		mock(DeviceProvisionedController.class), mMockBd, mDemoModeController,
		mock(CarrierConfigTracker.class), mFeatureFlags);
		mock(CarrierConfigTracker.class), mFeatureFlags, mock(DumpManager.class));
		setupNetworkController();

		setupDefaultSignal();

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerSignalTest.java

+7 −3

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ import com.android.settingslib.graph.SignalDrawable;
		import com.android.settingslib.mobile.TelephonyIcons;
		import com.android.settingslib.net.DataUsageController;
		import com.android.systemui.R;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.util.CarrierConfigTracker;

		import org.junit.Test;
		@@ -67,7 +68,8 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest {
		Looper.getMainLooper(), mFakeExecutor, mCallbackHandler,
		mock(AccessPointControllerImpl.class), mock(DataUsageController.class),
		mMockSubDefaults, mock(DeviceProvisionedController.class), mMockBd,
		mDemoModeController, mock(CarrierConfigTracker.class), mFeatureFlags);
		mDemoModeController, mock(CarrierConfigTracker.class), mFeatureFlags,
		mock(DumpManager.class));
		setupNetworkController();

		verifyLastMobileDataIndicators(false, -1, 0);
		@@ -87,7 +89,8 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest {
		Looper.getMainLooper(), mFakeExecutor, mCallbackHandler,
		mock(AccessPointControllerImpl.class), mock(DataUsageController.class),
		mMockSubDefaults, mock(DeviceProvisionedController.class), mMockBd,
		mDemoModeController, mock(CarrierConfigTracker.class), mFeatureFlags);
		mDemoModeController, mock(CarrierConfigTracker.class), mFeatureFlags,
		mock(DumpManager.class));
		mNetworkController.registerListeners();

		// Wait for the main looper to execute the previous command
		@@ -155,7 +158,8 @@ public class NetworkControllerSignalTest extends NetworkControllerBaseTest {
		Looper.getMainLooper(), mFakeExecutor, mCallbackHandler,
		mock(AccessPointControllerImpl.class), mock(DataUsageController.class),
		mMockSubDefaults, mock(DeviceProvisionedController.class), mMockBd,
		mDemoModeController, mock(CarrierConfigTracker.class), mFeatureFlags);
		mDemoModeController, mock(CarrierConfigTracker.class), mFeatureFlags,
		mock(DumpManager.class));
		setupNetworkController();

		// No Subscriptions.