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

Commit 92962842 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

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

Merge "When data switches during voice call, make sure signal bar updates it." into qt-dev am: 566f3521
am: 94159da5

Change-Id: I0e798a43011ad1a1ad1c9b7842e9827ef8449e66
parents e24345fc 94159da5

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

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



    private boolean isDataDisabled() {

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

        return !mPhone.isDataCapable();

    }



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

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

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

        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
@@ -164,7 +164,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

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

    public void testNoInternetIcon_withDefaultSub() {

        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_withDefaultSub() {

        setupNetworkController();

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

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

        setupDefaultSignal();

        updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0);

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

    public void testNoInternetIcon_withoutDefaultSub() {

        setupNetworkController();

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

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

        setupDefaultSignal();

        setDefaultSubId(mSubId + 1);

        updateDataConnectionState(TelephonyManager.DATA_CONNECTED, 0);
@@ -162,7 +162,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest { 
    @Test

    public void testDataDisabledIcon_withoutDefaultSub() {

        setupNetworkController();

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

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

        setupDefaultSignal();

        setDefaultSubId(mSubId + 1);

        updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0);
@@ -218,7 +218,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);
@@ -233,7 +233,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);