diff options
| author | Michael Gernoth <michael@gernoth.net> | 2016-01-16 04:40:00 -0500 |
|---|---|---|
| committer | rogersb11 <brettrogers11@gmail.com> | 2016-01-16 05:26:54 -0500 |
| commit | 20237caa07e89d73446929d80992045f44604ca9 (patch) | |
| tree | 8165ec4ef68e0b7b6986dbcab7b4c5b7c7cae035 | |
| parent | 9fd9be2bfdebc101869706cc23a252edfa0174b7 (diff) | |
| download | device_samsung_smdk4412-qcom-common-20237caa07e89d73446929d80992045f44604ca9.tar.gz device_samsung_smdk4412-qcom-common-20237caa07e89d73446929d80992045f44604ca9.tar.bz2 device_samsung_smdk4412-qcom-common-20237caa07e89d73446929d80992045f44604ca9.zip | |
Update preferredNetwork function
Includes pieces of these two commits, only some of the originals was needed
http://review.cyanogenmod.org/#/c/127631/
http://review.cyanogenmod.org/#/c/127914/
Change-Id: I1912ac466300055ff03557a8cb29679442fc8155
| -rw-r--r-- | ril/telephony/java/com/android/internal/telephony/smdk4x12QComRIL.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ril/telephony/java/com/android/internal/telephony/smdk4x12QComRIL.java b/ril/telephony/java/com/android/internal/telephony/smdk4x12QComRIL.java index 68ba932..1f22fcd 100644 --- a/ril/telephony/java/com/android/internal/telephony/smdk4x12QComRIL.java +++ b/ril/telephony/java/com/android/internal/telephony/smdk4x12QComRIL.java @@ -311,7 +311,10 @@ public class smdk4x12QComRIL extends RIL implements CommandsInterface { case RIL_UNSOL_RIL_CONNECTED: ret = responseInts(p); setRadioPower(false, null); - setPreferredNetworkType(mPreferredNetworkType, null); + if (!setPreferredNetworkTypeSeen) { + Rlog.v(RILJ_LOG_TAG, "smdk4x12QComRIL: connected, setting network type to " + mPreferredNetworkType); + setPreferredNetworkType(mPreferredNetworkType, null); + } setCdmaSubscriptionSource(mCdmaSubscription, null); if(mRilVersion >= 8) setCellInfoListRate(Integer.MAX_VALUE, null); @@ -674,8 +677,6 @@ public class smdk4x12QComRIL extends RIL implements CommandsInterface { riljLog("setPreferredNetworkType: " + networkType); if (!setPreferredNetworkTypeSeen) { - riljLog("Need to reboot modem!"); - setRadioPower(false, null); setPreferredNetworkTypeSeen = true; } |