commit 7059f27ca9cc04743affc5ff631d85415e5a927e
author Junda Liu <junda@google.com> Mon Aug 17 18:58:20 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 17 18:58:20 2015 +0000
tree ec25d7ecd8e5eda07f6ab0915e413b49989f4b6f
parent 1f059ef79b2f119b7a6cc58192839ea50531ec72
parent 3817cc94c781b78c9f52d9483e8426bbb9c5d1b5

Merge "Add hidden intent for sms based carrier provisioning." into mnc-dev

src/java/com/android/internal/telephony/RIL.java

diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index def2f7e..d834eef 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -3206,7 +3206,6 @@
 
                 // Initial conditions
                 setRadioPower(false, null);
-                setPreferredNetworkType(mPreferredNetworkType, null);
                 setCdmaSubscriptionSource(mCdmaSubscription, null);
                 setCellInfoListRate(Integer.MAX_VALUE, null);
                 notifyRegistrantsRilConnectionChanged(((int[])ret)[0]);

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 085f5b6..6bed5ac 100644
--- a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
+++ b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
@@ -472,8 +472,8 @@
             }
         }
 
-        if ((mSST != null) && (mSST.mSS.getState() == ServiceState.STATE_OUT_OF_SERVICE)
-                && !isEmergency) {
+        if (mSST != null && mSST.mSS.getState() == ServiceState.STATE_OUT_OF_SERVICE
+                && mSST.mSS.getDataRegState() != ServiceState.STATE_IN_SERVICE && !isEmergency) {
             throw new CallStateException("cannot dial in current state");
         }
         if (DBG) Rlog.d(LOG_TAG, "Trying (non-IMS) CS call");

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 3d4fe06..b861095 100755
--- a/src/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -847,8 +847,8 @@
             }
         }
 
-        if ((mSST != null) && (mSST.mSS.getState() == ServiceState.STATE_OUT_OF_SERVICE)
-                && !isEmergency) {
+        if (mSST != null && mSST.mSS.getState() == ServiceState.STATE_OUT_OF_SERVICE
+                && mSST.mSS.getDataRegState() != ServiceState.STATE_IN_SERVICE && !isEmergency) {
             throw new CallStateException("cannot dial in current state");
         }
         if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "Trying (non-IMS) CS call");