Setup data on new APNs only when APN changes

- If new records are loaded due to RAT change 1x->LTE or vice versa,
  connections need to be restarted
- If CDMA subscription change event is received, APN list needs to be
  created before setting up data call
- For all other cases, setup data connections if there is also a change
  in APN

CRs-Fixed: 960246

Change-Id: I5093f506daed8b8d5e8a1fd5220043d0cd55918c

1 files changed, 4 insertions, 3 deletions

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
index 9295b9113..e1569ae8f 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTracker.java
@@ -2930,9 +2930,6 @@ public class DcTracker extends DcTrackerBase {
 
             case DctConstants.EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED: // fall thru
             case DctConstants.EVENT_DATA_RAT_CHANGED:
-                //May new Network allow setupData, so try it here
-                setupDataOnConnectableApns(Phone.REASON_NW_TYPE_CHANGED,
-                        RetryFailures.ONLY_ON_CHANGE);
                 // When data rat changes we might need to load different
                 // set of apns (example, LTE->1x)
                 if (onUpdateIcc()) {
@@ -2942,6 +2939,10 @@ public class DcTracker extends DcTrackerBase {
                     // If cdma subscription source changed to NV or data rat changed to cdma
                     // (while subscription source was NV) - we need to trigger NV ready
                     onNvReady();
+                } else {
+                    //May new Network allow setupData, so try it here
+                    setupDataOnConnectableApns(Phone.REASON_NW_TYPE_CHANGED,
+                            RetryFailures.ONLY_ON_CHANGE);
                 }
                 break;