Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 566f3521cd

Change-Id: I52f1234f36ad24b6e468e4cd9d2ca1c750cdddd7
This commit is contained in:
Xiangyu/Malcolm Chen
2019-06-14 11:03:27 -07:00
committed by android-build-merger
parent ce25bd2f09 566f3521cd
commit 94159da522
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -545,7 +545,7 @@ public class MobileSignalController extends SignalController<
} }
private boolean isDataDisabled() { private boolean isDataDisabled() {
return !mPhone.getDataEnabled(mSubscriptionInfo.getSubscriptionId()); return !mPhone.isDataCapable();
} }
@VisibleForTesting @VisibleForTesting
@@ -566,6 +566,7 @@ public class MobileSignalController extends SignalController<
pw.println(" mDataState=" + mDataState + ","); pw.println(" mDataState=" + mDataState + ",");
pw.println(" mDataNetType=" + mDataNetType + ","); pw.println(" mDataNetType=" + mDataNetType + ",");
pw.println(" mInflateSignalStrengths=" + mInflateSignalStrengths + ","); pw.println(" mInflateSignalStrengths=" + mInflateSignalStrengths + ",");
pw.println(" isDataDisabled=" + isDataDisabled() + ",");
} }
class MobilePhoneStateListener extends PhoneStateListener { class MobilePhoneStateListener extends PhoneStateListener {

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

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

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

@@ -119,7 +119,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
@Test @Test
public void testNoInternetIcon_withDefaultSub() { public void testNoInternetIcon_withDefaultSub() {
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_withDefaultSub() { public void testDataDisabledIcon_withDefaultSub() {
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);
@@ -147,7 +147,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
@Test @Test
public void testNoInternetIcon_withoutDefaultSub() { public void testNoInternetIcon_withoutDefaultSub() {
setupNetworkController(); setupNetworkController();
when(mMockTm.getDataEnabled(mSubId)).thenReturn(false); when(mMockTm.isDataCapable()).thenReturn(false);
setupDefaultSignal(); setupDefaultSignal();
setDefaultSubId(mSubId + 1); setDefaultSubId(mSubId + 1);
updateDataConnectionState(TelephonyManager.DATA_CONNECTED, 0); updateDataConnectionState(TelephonyManager.DATA_CONNECTED, 0);
@@ -162,7 +162,7 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
@Test @Test
public void testDataDisabledIcon_withoutDefaultSub() { public void testDataDisabledIcon_withoutDefaultSub() {
setupNetworkController(); setupNetworkController();
when(mMockTm.getDataEnabled(mSubId)).thenReturn(false); when(mMockTm.isDataCapable()).thenReturn(false);
setupDefaultSignal(); setupDefaultSignal();
setDefaultSubId(mSubId + 1); setDefaultSubId(mSubId + 1);
updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0); updateDataConnectionState(TelephonyManager.DATA_DISCONNECTED, 0);
@@ -218,7 +218,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);
@@ -233,7 +233,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);