Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1196b35e authored by Ethan Chen's avatar Ethan Chen
Browse files

Revert "libril: HTC8960RIL: add flag to force CDMA+LTE network mode" 

This reverts part of commit: 492c3653

Change-Id: I8cd4d1261b26e9fbe2aaaf7d423b9606aa243494
parent fad8882d

src/java/com/android/internal/telephony/HTCQualcommRIL.java

+0 −21
Original line number Diff line number Diff line
@@ -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,27 +103,9 @@ 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) {