Merge "refactor servicestate data/voice roaming states"android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-release

2 files changed, 7 insertions, 14 deletions

diff --git a/src/java/com/android/internal/telephony/ServiceStateTracker.java b/src/java/com/android/internal/telephony/ServiceStateTracker.java
index 3e992adc74..b2f5fc437a 100644
--- a/src/java/com/android/internal/telephony/ServiceStateTracker.java
+++ b/src/java/com/android/internal/telephony/ServiceStateTracker.java
@@ -1879,9 +1879,6 @@ public class ServiceStateTracker extends Handler {
                     mNewReasonDataDenied = networkRegState.getRejectCause();
                     mNewMaxDataCalls = dataSpecificStates.maxDataCalls;
                     mDataRoaming = regCodeIsRoaming(registrationState);
-                    // Save the data roaming state reported by modem registration before resource
-                    // overlay or carrier config possibly overrides it.
-                    mNewSS.setDataRoamingFromRegistration(mDataRoaming);
 
                     if (DBG) {
                         log("handlPollStateResultMessage: GsmSST dataServiceState=" + serviceState
@@ -1892,9 +1889,6 @@ public class ServiceStateTracker extends Handler {
 
                     boolean isDataRoaming = regCodeIsRoaming(registrationState);
                     mNewSS.setDataRoaming(isDataRoaming);
-                    // Save the data roaming state reported by modem registration before resource
-                    // overlay or carrier config possibly overrides it.
-                    mNewSS.setDataRoamingFromRegistration(isDataRoaming);
 
                     if (DBG) {
                         log("handlPollStateResultMessage: cdma dataServiceState=" + serviceState
@@ -1921,9 +1915,6 @@ public class ServiceStateTracker extends Handler {
                     // voice roaming state in done while handling EVENT_POLL_STATE_REGISTRATION_CDMA
                     boolean isDataRoaming = regCodeIsRoaming(registrationState);
                     mNewSS.setDataRoaming(isDataRoaming);
-                    // Save the data roaming state reported by modem registration before resource
-                    // overlay or carrier config possibly overrides it.
-                    mNewSS.setDataRoamingFromRegistration(isDataRoaming);
                     if (DBG) {
                         log("handlPollStateResultMessage: CdmaLteSST dataServiceState="
                                 + serviceState + " registrationState=" + registrationState
diff --git a/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java b/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java
index 55fde4964f..02e62d268f 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/ServiceStateTest.java
@@ -35,6 +35,13 @@ public class ServiceStateTest extends TestCase {
     @SmallTest
     public void testRoaming() {
         ServiceState ss = new ServiceState();
+        // add data registration state
+        ss.addNetworkRegistrationState(new NetworkRegistrationState(
+                NetworkRegistrationState.DOMAIN_PS, AccessNetworkConstants.TransportType.WWAN,
+                NetworkRegistrationState.REG_STATE_ROAMING,
+                TelephonyManager.NETWORK_TYPE_UNKNOWN, 0,
+                false, null, null));
+        assertTrue(ss.getDataRoamingFromRegistration());
 
         ss.setCdmaDefaultRoamingIndicator(1);
         assertEquals(1, ss.getCdmaDefaultRoamingIndicator());
@@ -52,9 +59,6 @@ public class ServiceStateTest extends TestCase {
         assertTrue(ss.getDataRoaming());
         assertEquals(ServiceState.ROAMING_TYPE_DOMESTIC, ss.getDataRoamingType());
 
-        ss.setDataRoamingFromRegistration(true);
-        assertTrue(ss.getDataRoamingFromRegistration());
-
         ss.setVoiceRoamingType(ServiceState.ROAMING_TYPE_DOMESTIC);
         assertTrue(ss.getVoiceRoaming());
         assertEquals(ServiceState.ROAMING_TYPE_DOMESTIC, ss.getVoiceRoamingType());
@@ -238,7 +242,6 @@ public class ServiceStateTest extends TestCase {
         ss.setCdmaEriIconIndex(6);
         ss.setCdmaEriIconMode(7);
         ss.setEmergencyOnly(true);
-        ss.setDataRoamingFromRegistration(true);
         ss.setChannelNumber(2100);
         ss.setCellBandwidths(new int[]{1400, 5000, 10000});
 
@@ -268,7 +271,6 @@ public class ServiceStateTest extends TestCase {
         ss.setCdmaEriIconIndex(6);
         ss.setCdmaEriIconMode(7);
         ss.setEmergencyOnly(true);
-        ss.setDataRoamingFromRegistration(true);
         ss.setChannelNumber(2100);
         ss.setCellBandwidths(new int[]{3, 4, 10});