Merge "When data switches during voice call, make sure signal bar updates it." (b6ae55b1) · Commits · e / os / android_frameworks_base

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -548,7 +548,7 @@ public class MobileSignalController extends SignalController<
	}		}

	private boolean isDataDisabled() {		private boolean isDataDisabled() {
	return !mPhone.getDataEnabled(mSubscriptionInfo.getSubscriptionId());		return !mPhone.isDataCapable();
	}		}

	@VisibleForTesting		@VisibleForTesting
	@@ -568,6 +568,7 @@ public class MobileSignalController extends SignalController<
	pw.println(" mSignalStrength=" + mSignalStrength + ",");		pw.println(" mSignalStrength=" + mSignalStrength + ",");
	pw.println(" mDataState=" + mDataState + ",");		pw.println(" mDataState=" + mDataState + ",");
	pw.println(" mDataNetType=" + mDataNetType + ",");		pw.println(" mDataNetType=" + mDataNetType + ",");
			pw.println(" isDataDisabled=" + isDataDisabled() + ",");
	}		}

	class MobilePhoneStateListener extends PhoneStateListener {		class MobilePhoneStateListener extends PhoneStateListener {

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -155,7 +155,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
	protected void setupNetworkController() {		protected void setupNetworkController() {
	// For now just pretend to be the data sim, so we can test that too.		// For now just pretend to be the data sim, so we can test that too.
	mSubId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;		mSubId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;
	when(mMockTm.getDataEnabled(mSubId)).thenReturn(true);		when(mMockTm.isDataCapable()).thenReturn(true);
	setDefaultSubId(mSubId);		setDefaultSubId(mSubId);
	setSubscriptions(mSubId);		setSubscriptions(mSubId);
	mMobileSignalController = mNetworkController.mMobileSignalControllers.get(mSubId);		mMobileSignalController = mNetworkController.mMobileSignalControllers.get(mSubId);

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -119,7 +119,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
	@Test		@Test
	public void testNoInternetIcon() {		public void testNoInternetIcon() {
	setupNetworkController();		setupNetworkController();
	when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);		when(mMockTm.isDataCapable()).thenReturn(false);
	setupDefaultSignal();		setupDefaultSignal();
	updateDataConnectionState(TelephonyManager.DATA_CONNECTED, 0);		updateDataConnectionState(TelephonyManager.DATA_CONNECTED, 0);
	setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);		setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);
	@@ -133,7 +133,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
	@Test		@Test
	public void testDataDisabledIcon() {		public void testDataDisabledIcon() {
	setupNetworkController();		setupNetworkController();
	when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);		when(mMockTm.isDataCapable()).thenReturn(false);
	setupDefaultSignal();		setupDefaultSignal();
	updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0);		updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0);
	setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);		setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);
	@@ -188,7 +188,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
	@Test		@Test
	public void testDataDisabledIcon_UserNotSetup() {		public void testDataDisabledIcon_UserNotSetup() {
	setupNetworkController();		setupNetworkController();
	when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);		when(mMockTm.isDataCapable()).thenReturn(false);
	setupDefaultSignal();		setupDefaultSignal();
	updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0);		updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0);
	setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);		setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);
	@@ -203,7 +203,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
	@Test		@Test
	public void testAlwaysShowDataRatIcon() {		public void testAlwaysShowDataRatIcon() {
	setupDefaultSignal();		setupDefaultSignal();
	when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);		when(mMockTm.isDataCapable()).thenReturn(false);
	updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED,		updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED,
	TelephonyManager.NETWORK_TYPE_GSM);		TelephonyManager.NETWORK_TYPE_GSM);