Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ec90cb3 authored by Malcolm Chen's avatar Malcolm Chen Committed by Xiangyu/Malcolm Chen
Browse files

When data switches during voice call, make sure signal bar updates it. 

isDataEnabled only reflects user setting of mobile data is on or off.
isDataCapable reflects better of whether the data could be setup or not,
considering user settings and other restrictions and exceptions.

We should use isDataCapable when deciding what to show in signal bar.

When non default data SIM is in voice call, there could be an exception
that we also setup data on that SIM.

Bug: 134981077
Test: manual
Change-Id: I54fc4ca104cb451af847d7973fbffc7f0ed97c10
Merged-In: I54fc4ca104cb451af847d7973fbffc7f0ed97c10
parent aa3512ba

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

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



    private boolean isDataDisabled() {

        return !mPhone.getDataEnabled(mSubscriptionInfo.getSubscriptionId());

        return !mPhone.isDataCapable();

    }



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

        pw.println("  mDataState=" + mDataState + ",");

        pw.println("  mDataNetType=" + mDataNetType + ",");

        pw.println("  isDataDisabled=" + isDataDisabled() + ",");

    }



    class MobilePhoneStateListener extends PhoneStateListener {

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

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase { 
    protected void setupNetworkController() {

        // For now just pretend to be the data sim, so we can test that too.

        mSubId = SubscriptionManager.DEFAULT_SUBSCRIPTION_ID;

        when(mMockTm.getDataEnabled(mSubId)).thenReturn(true);

        when(mMockTm.isDataCapable()).thenReturn(true);

        setDefaultSubId(mSubId);

        setSubscriptions(mSubId);

        mMobileSignalController = mNetworkController.mMobileSignalControllers.get(mSubId);

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

+4 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    @Test

    public void testNoInternetIcon() {

        setupNetworkController();

        when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);

        when(mMockTm.isDataCapable()).thenReturn(false);

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_CONNECTED, 0);

        setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);
@@ -133,7 +133,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    @Test

    public void testDataDisabledIcon() {

        setupNetworkController();

        when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);

        when(mMockTm.isDataCapable()).thenReturn(false);

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0);

        setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);
@@ -188,7 +188,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    @Test

    public void testDataDisabledIcon_UserNotSetup() {

        setupNetworkController();

        when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);

        when(mMockTm.isDataCapable()).thenReturn(false);

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0);

        setConnectivityViaBroadcast(NetworkCapabilities.TRANSPORT_CELLULAR, false, false);
@@ -203,7 +203,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    @Test

    public void testAlwaysShowDataRatIcon() {

        setupDefaultSignal();

        when(mMockTm.getDataEnabled(mSubId)).thenReturn(false);

        when(mMockTm.isDataCapable()).thenReturn(false);

        updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED,

                TelephonyManager.NETWORK_TYPE_GSM);