commit bb521eea92ad2b91b4aeeb722cdf68d08985ce33
author Nancy Chen <nancychen@google.com> Thu Sep 03 17:10:16 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 03 17:10:16 2015 +0000
tree ef40c8a36726ffa7167d8db1fd26d93973429a78
parent fc8883b2cdb5735a26d8416d96350dba1e1c5472
parent 00f2a8351722840725b5e808b2fb60d7309b8aa8

Merge "Do not send deactivate SMS because the account may be unprovisioned." into mnc-dev

src/com/android/services/telephony/CdmaConnection.java

diff --git a/src/com/android/services/telephony/CdmaConnection.java b/src/com/android/services/telephony/CdmaConnection.java
index d2250d4..d13f66f 100644
--- a/src/com/android/services/telephony/CdmaConnection.java
+++ b/src/com/android/services/telephony/CdmaConnection.java
@@ -192,7 +192,7 @@
         if (isDialing) {
             setDialing();
         } else {
-            updateState();
+            updateState(true);
         }
     }
 

src/com/android/services/telephony/TelephonyConnection.java

diff --git a/src/com/android/services/telephony/TelephonyConnection.java b/src/com/android/services/telephony/TelephonyConnection.java
index cbe7c0a..8e846e4 100644
--- a/src/com/android/services/telephony/TelephonyConnection.java
+++ b/src/com/android/services/telephony/TelephonyConnection.java
@@ -708,13 +708,17 @@
     }
 
     void updateState() {
+       updateState(false);
+    }
+
+    void updateState(boolean force) {
         if (mOriginalConnection == null) {
             return;
         }
 
         Call.State newState = mOriginalConnection.getState();
         Log.v(this, "Update state from %s to %s for %s", mOriginalConnectionState, newState, this);
-        if (mOriginalConnectionState != newState) {
+        if (mOriginalConnectionState != newState || force) {
             mOriginalConnectionState = newState;
             switch (newState) {
                 case IDLE: