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

Commit 049b7111 authored by jared caliendo's avatar jared caliendo Committed by Ricardo Cerqueira
Browse files

Move custom icccardstatus back to HTCQualcommRil.

On m7spr and jewel,  we no longer need the custom ril class.

Patchset4: remove htccdmaqualcommril class.

Change-Id: I02a26a8d52f724e4ba0e8955f6ab8fae1951edbb

Conflicts:
	src/java/com/android/internal/telephony/HTCCDMAQualcommRIL.java
parent eb50bbae
Loading
Loading
Loading
Loading
+0 −683

File deleted.

Preview size limit exceeded, changes collapsed.

+13 −0
Original line number Diff line number Diff line
@@ -50,6 +50,19 @@ public class HTCQualcommRIL extends RIL implements CommandsInterface {
        super(context, networkMode, cdmaSubscription);
    }

    @Override
    protected Object
    responseIccCardStatus(Parcel p) {
        // force CDMA + LTE network mode
        boolean forceCdmaLte = needsOldRilFeature("forceCdmaLteNetworkType");

        if (forceCdmaLte) {
            setPreferredNetworkType(NETWORK_MODE_LTE_CDMA_EVDO, null);
        }

        return super.responseIccCardStatus(p);
    }

    @Override
    protected DataCallResponse getDataCallResponse(Parcel p, int version) {
        DataCallResponse dataCall = new DataCallResponse();