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

Get data type from service state as well am: 67b2c16a9a

Browse Source 
am: 05130f3f23

* commit '05130f3f237efbbf497b770938e0b758a646de1a':
  Get data type from service state as well
This commit is contained in:
Jason Monk
2016-01-12 18:58:28 +00:00
committed by android-build-merger
parent 65abc0e3d3 05130f3f23
commit 8ced692e44
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,6 +440,7 @@ public class MobileSignalController extends SignalController<
+ " dataState=" + state.getDataRegState()); + " dataState=" + state.getDataRegState());
} }
mServiceState = state; mServiceState = state;
mDataNetType = state.getDataNetworkType();
updateTelephony(); updateTelephony();
} }

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

@@ -59,8 +59,8 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
protected NetworkControllerImpl mNetworkController; protected NetworkControllerImpl mNetworkController;
protected MobileSignalController mMobileSignalController; protected MobileSignalController mMobileSignalController;
protected PhoneStateListener mPhoneStateListener; protected PhoneStateListener mPhoneStateListener;
private SignalStrength mSignalStrength; protected SignalStrength mSignalStrength;
private ServiceState mServiceState; protected ServiceState mServiceState;
protected ConnectivityManager mMockCm; protected ConnectivityManager mMockCm;
protected WifiManager mMockWm; protected WifiManager mMockWm;
protected SubscriptionManager mMockSm; protected SubscriptionManager mMockSm;
@@ -234,7 +234,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
mPhoneStateListener.onSignalStrengthsChanged(mSignalStrength); mPhoneStateListener.onSignalStrengthsChanged(mSignalStrength);
} }
private void updateServiceState() { protected void updateServiceState() {
Log.d(TAG, "Sending Service State: " + mServiceState); Log.d(TAG, "Sending Service State: " + mServiceState);
mPhoneStateListener.onServiceStateChanged(mServiceState); mPhoneStateListener.onServiceStateChanged(mServiceState);
} }
@@ -245,6 +245,7 @@ public class NetworkControllerBaseTest extends SysuiTestCase {
} }
public void updateDataConnectionState(int dataState, int dataNetType) { public void updateDataConnectionState(int dataState, int dataNetType) {
when(mServiceState.getDataNetworkType()).thenReturn(dataNetType);
mPhoneStateListener.onDataConnectionStateChanged(dataState, dataNetType); mPhoneStateListener.onDataConnectionStateChanged(dataState, dataNetType);
} }

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

@@ -114,6 +114,21 @@ public class NetworkControllerDataTest extends NetworkControllerBaseTest {
TelephonyIcons.QS_DATA_4G); TelephonyIcons.QS_DATA_4G);
} }
public void testDataChangeWithoutConnectionState() {
setupDefaultSignal();
updateDataConnectionState(TelephonyManager.DATA_CONNECTED,
TelephonyManager.NETWORK_TYPE_LTE);
verifyDataIndicators(TelephonyIcons.DATA_LTE[1][0 /* No direction */],
TelephonyIcons.QS_DATA_LTE);
Mockito.when(mServiceState.getDataNetworkType())
.thenReturn(TelephonyManager.NETWORK_TYPE_HSPA);
updateServiceState();
verifyDataIndicators(TelephonyIcons.DATA_H[1][0 /* No direction */],
TelephonyIcons.QS_DATA_H);
}
public void testDataActivity() { public void testDataActivity() {
setupDefaultSignal(); setupDefaultSignal();