commit 1f8e6cacec886736414f3b7d750ad1fa973ab20d
author Wink Saville <wink@google.com> Fri Mar 29 18:02:11 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 29 18:02:11 2013 +0000
tree f11150aa8cf8cbd1b62ac49c4fd6f62379dbba96
parent c6bbea82bf74ebb492508199b6f3e172b7ce860a
parent c3b7c73fd6a494483e941adddcb3c0c23f4f0a70

Merge "Add fix and add some debugging." into jb-mr2-dev

src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java

diff --git a/src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java b/src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
index edf788e..22de62d 100644
--- a/src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
+++ b/src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
@@ -124,6 +124,7 @@
             ret = PhoneConstants.DataState.DISCONNECTED;
         } else {
             switch (mDcTracker.getState(apnType)) {
+                case RETRYING:
                 case FAILED:
                 case IDLE:
                     ret = PhoneConstants.DataState.DISCONNECTED;
@@ -139,7 +140,6 @@
                     }
                     break;
 
-                case RETRYING:
                 case CONNECTING:
                 case SCANNING:
                     ret = PhoneConstants.DataState.CONNECTING;

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

diff --git a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
index f8cb7a5..d47c2af 100755
--- a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
+++ b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
@@ -670,6 +670,7 @@
             ret = PhoneConstants.DataState.DISCONNECTED;
         } else {
             switch (mDcTracker.getState(apnType)) {
+                case RETRYING:
                 case FAILED:
                 case IDLE:
                     ret = PhoneConstants.DataState.DISCONNECTED;
@@ -685,7 +686,6 @@
                     }
                 break;
 
-                case RETRYING:
                 case CONNECTING:
                 case SCANNING:
                     ret = PhoneConstants.DataState.CONNECTING;

src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java b/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
index 3030706..cea0d4f 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
@@ -674,12 +674,12 @@
                 break;
 
             case DctConstants.EVENT_DISCONNECT_DONE:
-                log("DataConnectoinTracker.handleMessage: EVENT_DISCONNECT_DONE msg=" + msg);
+                log("DataConnectionTracker.handleMessage: EVENT_DISCONNECT_DONE msg=" + msg);
                 onDisconnectDone(msg.arg1, (AsyncResult) msg.obj);
                 break;
 
             case DctConstants.EVENT_DISCONNECT_DC_RETRYING:
-                log("DataConnectoinTracker.handleMessage: EVENT_DISCONNECT_DC_RETRYING msg=" + msg);
+                log("DataConnectionTracker.handleMessage: EVENT_DISCONNECT_DC_RETRYING msg=" + msg);
                 onDisconnectDcRetrying(msg.arg1, (AsyncResult) msg.obj);
                 break;
 

src/java/com/android/internal/telephony/gsm/GSMPhone.java

diff --git a/src/java/com/android/internal/telephony/gsm/GSMPhone.java b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
index 5739dec..aaa3fa5 100644
--- a/src/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -300,6 +300,7 @@
             ret = PhoneConstants.DataState.DISCONNECTED;
         } else { /* mSST.gprsState == ServiceState.STATE_IN_SERVICE */
             switch (mDcTracker.getState(apnType)) {
+                case RETRYING:
                 case FAILED:
                 case IDLE:
                     ret = PhoneConstants.DataState.DISCONNECTED;
@@ -315,7 +316,6 @@
                     }
                 break;
 
-                case RETRYING:
                 case CONNECTING:
                 case SCANNING:
                     ret = PhoneConstants.DataState.CONNECTING;