diff options
| author | Ethan Chen <intervigil@gmail.com> | 2013-05-16 16:09:58 -0700 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2013-05-16 17:05:41 -0700 |
| commit | 1196b35e54e187a453b8bf6ecfbb37e1f98f83e3 (patch) | |
| tree | a615ee7f309a282fd26993f28678abe65a55de1b | |
| parent | fad8882d4a496a4cadb07bf2bfefbb8cad5c7579 (diff) | |
| download | frameworks_opt_telephony-1196b35e54e187a453b8bf6ecfbb37e1f98f83e3.zip frameworks_opt_telephony-1196b35e54e187a453b8bf6ecfbb37e1f98f83e3.tar.gz frameworks_opt_telephony-1196b35e54e187a453b8bf6ecfbb37e1f98f83e3.tar.bz2 | |
Revert "libril: HTC8960RIL: add flag to force CDMA+LTE network mode"
This reverts part of commit: 492c36536d259d55ea947a03ff22ad05ae6f51b2
Change-Id: I8cd4d1261b26e9fbe2aaaf7d423b9606aa243494
| -rw-r--r-- | src/java/com/android/internal/telephony/HTCQualcommRIL.java | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/java/com/android/internal/telephony/HTCQualcommRIL.java b/src/java/com/android/internal/telephony/HTCQualcommRIL.java index c96f1ec..b900235 100644 --- a/src/java/com/android/internal/telephony/HTCQualcommRIL.java +++ b/src/java/com/android/internal/telephony/HTCQualcommRIL.java @@ -65,9 +65,6 @@ public class HTCQualcommRIL extends RIL implements CommandsInterface { // a new method just for naming sake. boolean oldRil = needsOldRilFeature("icccardstatus"); - // force CDMA + LTE network type - boolean forceCdmaLteNetworkType = needsOldRilFeature("forceCdmaLteNetworkType"); - IccCardStatus cardStatus = new IccCardStatus(); cardStatus.setCardState(p.readInt()); cardStatus.setUniversalPinState(p.readInt()); @@ -106,28 +103,10 @@ public class HTCQualcommRIL extends RIL implements CommandsInterface { cardStatus.mApplications[i] = appStatus; } - // pretty hack way to do it. but keeps it out of CM telephony stack - if (forceCdmaLteNetworkType) - setPreferredNetworkType(8, null); - return cardStatus; } @Override - public void setPreferredNetworkType(int networkType , Message response) { - /** - * If not using a USIM, ignore LTE mode and go to 3G - */ - if (!mUSIM && networkType == RILConstants.NETWORK_MODE_LTE_GSM_WCDMA && - mSetPreferredNetworkType >= RILConstants.NETWORK_MODE_WCDMA_PREF) { - networkType = RILConstants.NETWORK_MODE_WCDMA_PREF; - } - mSetPreferredNetworkType = networkType; - - super.setPreferredNetworkType(networkType, response); - } - - @Override protected Object responseSignalStrength(Parcel p) { /* HTC signal strength format: |