diff options
| author | Jef Oliver <jeagoss@gmail.com> | 2012-12-28 21:24:32 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-12-28 21:24:32 -0800 |
| commit | dac9376cc94f2a9b5261dbcaed63db4c29c221a3 (patch) | |
| tree | 1ae99e8fe3a45f7d0fcfa9ccc29d990c58931e83 /src/java/com | |
| parent | 60a7d2e082dee489a3f7b6d9d28336a1b333ba8a (diff) | |
| parent | 63bfa73933bee6a759563f927c7d6e0e3dec27da (diff) | |
| download | frameworks_opt_telephony-dac9376cc94f2a9b5261dbcaed63db4c29c221a3.zip frameworks_opt_telephony-dac9376cc94f2a9b5261dbcaed63db4c29c221a3.tar.gz frameworks_opt_telephony-dac9376cc94f2a9b5261dbcaed63db4c29c221a3.tar.bz2 | |
Merge "telephony: CdmaServiceStateTracker: Get cdma sub. when ruim ready." into cm-10.1
Diffstat (limited to 'src/java/com')
| -rwxr-xr-x | src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java index 2554691..7d34325 100755 --- a/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java @@ -95,6 +95,9 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { private int mNitzUpdateDiff = SystemProperties.getInt("ro.nitz_update_diff", NITZ_UPDATE_DIFF_DEFAULT); + private boolean mSubscribeOnRuimReady = SystemProperties.getBoolean( + "ro.cdma.subscribe_on_ruim_ready", false); + private boolean mCdmaRoaming = false; private int mRoamingIndicator; private boolean mIsInPrl; @@ -286,7 +289,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { // TODO: Consider calling setCurrentPreferredNetworkType as we do in GsmSST. // cm.setCurrentPreferredNetworkType(); - if (phone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) { + if (!mSubscribeOnRuimReady && phone.getLteOnCdmaMode() == PhoneConstants.LTE_ON_CDMA_TRUE) { // Subscription will be read from SIM I/O if (DBG) log("Receive EVENT_RUIM_READY"); pollState(); |