SamsungQualcommRIL: fix race condition when starting phone type.

* ril is init but hasn't picked cdma or gsm, instead the ril picks no-phone.
* support switching gsm to cdma and vica versa
Change-Id: Ib9eaf88d5a7e90b2458ab787da230fca9a41249f

1 files changed, 6 insertions, 2 deletions

diff --git a/src/java/com/android/internal/telephony/SamsungQualcommRIL.java b/src/java/com/android/internal/telephony/SamsungQualcommRIL.java
index b29adc4..125d518 100644
--- a/src/java/com/android/internal/telephony/SamsungQualcommRIL.java
+++ b/src/java/com/android/internal/telephony/SamsungQualcommRIL.java
@@ -194,6 +194,12 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface {
 
     }
 
+    @Override
+    public void setPhoneType(int phoneType){
+        super.setPhoneType(phoneType);
+        isGSM = (phoneType != RILConstants.CDMA_PHONE);
+        samsungDriverCall = (needsOldRilFeature("newDriverCall") && !isGSM) || mRilVersion < 7 ? false : true;
+    }
 
     @Override
     protected void
@@ -210,8 +216,6 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface {
                 setRadioPower(false, null);
                 setPreferredNetworkType(mPreferredNetworkType, null);
                 notifyRegistrantsRilConnectionChanged(((int[])ret)[0]);
-                isGSM = (mPhoneType != RILConstants.CDMA_PHONE);
-                samsungDriverCall = (needsOldRilFeature("newDriverCall") && !isGSM) || mRilVersion < 7 ? false : true;
                 break;
             case RIL_UNSOL_NITZ_TIME_RECEIVED:
                 handleNitzTimeReceived(p);