summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--telephony/java/com/android/internal/telephony/QualcommSharedRIL.java2
-rw-r--r--telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java12
2 files changed, 10 insertions, 4 deletions
diff --git a/telephony/java/com/android/internal/telephony/QualcommSharedRIL.java b/telephony/java/com/android/internal/telephony/QualcommSharedRIL.java
index 811919d..4c29b2f 100644
--- a/telephony/java/com/android/internal/telephony/QualcommSharedRIL.java
+++ b/telephony/java/com/android/internal/telephony/QualcommSharedRIL.java
@@ -629,7 +629,7 @@ public class QualcommSharedRIL extends RIL implements CommandsInterface {
}
}
- private void setRadioStateFromRILInt (int stateCode) {
+ protected void setRadioStateFromRILInt (int stateCode) {
CommandsInterface.RadioState radioState;
HandlerThread handlerThread;
Looper looper;
diff --git a/telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java b/telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java
index 7d827d5..643c181 100644
--- a/telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java
+++ b/telephony/java/com/android/internal/telephony/SamsungCDMAQualcommRIL.java
@@ -44,6 +44,7 @@ import java.util.Collections;
* Samsung CDMA RIL doesn't send CDMA NV in RIUM infomation format which causes the CDMA RIL stack to crash and end up not being provisioned.
* Samsung put CDMA NV in GSM format. I forced the RIL stack to process CDMA NV request as a GSM SIM in CDMA mode.
* Custom Qualcomm No SimReady RIL using the latest Uicc stack
+ * Check for CDMA phone on RADIO_ON* event and if so set status to RUIM_NOT_READY to trigger CSIM/RUIM processing
*
* {@hide}
*/
@@ -101,7 +102,6 @@ public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements Command
appIndex = status.getGsmUmtsSubscriptionAppIndex();
Log.d(LOG_TAG, "This is a CDMA PHONE " + appIndex);
-
if (numApplications > 0) {
IccCardApplication application = status.getApplication(appIndex);
mAid = application.aid;
@@ -117,7 +117,8 @@ public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements Command
return status;
}
- private void setRadioStateFromRILInt (int stateCode) {
+ @Override
+ protected void setRadioStateFromRILInt (int stateCode) {
CommandsInterface.RadioState radioState;
HandlerThread handlerThread;
Looper looper;
@@ -147,8 +148,12 @@ public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements Command
mIccHandler = new IccHandler(this,looper);
mIccHandler.run();
}
- radioState = CommandsInterface.RadioState.SIM_NOT_READY;
+ if (mPhoneType == RILConstants.CDMA_PHONE) {
+ radioState = CommandsInterface.RadioState.RUIM_NOT_READY;
+ } else {
+ radioState = CommandsInterface.RadioState.SIM_NOT_READY;
+ }
setRadioState(radioState);
break;
default:
@@ -157,6 +162,7 @@ public class SamsungCDMAQualcommRIL extends QualcommSharedRIL implements Command
setRadioState (radioState);
}
+
@Override
protected Object
responseSignalStrength(Parcel p) {