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

Commit 8fba9b36 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Update all CM radio code for the current API 

Change-Id: Ic29c2e06d48fdf8a7f0ea6d859c5d30e046a8940
parent 0f9d7497

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

+1 −1
Original line number Diff line number Diff line
@@ -1854,7 +1854,7 @@ public final class CallManager { 
                    mSuppServiceFailedRegistrants.notifyRegistrants((AsyncResult) msg.obj);

                    break;

                case EVENT_SUPP_SERVICE_NOTIFY:

                    if (VDBG) Log.d(LOG_TAG, " handleMessage (EVENT_SUPP_SERVICE_NOTIFICATION)");

                    if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_SUPP_SERVICE_NOTIFICATION)");

                    mSuppServiceNotificationRegistrants.notifyRegistrants((AsyncResult) msg.obj);

                    break;

                case EVENT_SERVICE_STATE_CHANGED:

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

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import android.os.Parcel; 
import android.text.TextUtils;

import android.util.Log;



import com.android.internal.telephony.IccCardApplicationStatus;

import com.android.internal.telephony.IccCardStatus;

import com.android.internal.telephony.uicc.IccCardApplicationStatus;

import com.android.internal.telephony.uicc.IccCardStatus;



import java.util.ArrayList;

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

+5 −1
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ import android.util.Log; 


import java.util.ArrayList;



import com.android.internal.telephony.uicc.IccCardApplicationStatus;

import com.android.internal.telephony.uicc.IccCardStatus;

import com.android.internal.telephony.dataconnection.DataCallResponse;



/**

 * Custom Qualcomm No SimReady RIL for LGE using the latest Uicc stack

 *
@@ -85,7 +89,7 @@ public class LGEQualcommUiccRIL extends QualcommSharedRIL implements CommandsInt 
    @Override

    protected Object

    responseSetupDataCall(Parcel p) {

        DataCallState dataCall;

        DataCallResponse dataCall;



        boolean oldRil = needsOldRilFeature("datacall");

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

+0 −8
Original line number Diff line number Diff line
@@ -1391,14 +1391,6 @@ public abstract class PhoneBase extends Handler implements Phone { 
        return mCi.getLteOnGsmMode();

    }



    /**

     * {@hide}

     */

    @Override

    public int getLteOnGsmMode() {

        return mCM.getLteOnGsmMode();

    }



    /**

     * Sets the SIM voice message waiting indicator records.

     * @param line GSM Subscriber Profile Number, one-based. Only '1' is supported

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

+4 −3
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.net.LocalServerSocket;

import android.os.Looper;

import android.os.SystemProperties;

import android.provider.Settings;

import android.telephony.Rlog;

import android.telephony.TelephonyManager;
@@ -116,12 +117,12 @@ public class PhoneFactory { 
                int cdmaSubscription;

                cdmaSubscription = Settings.Global.getInt(context.getContentResolver(),

                                Settings.Global.CDMA_SUBSCRIPTION_MODE,

                                preferredCdmaSubscription);

                                sPreferredCdmaSubscription);

                Rlog.i(LOG_TAG, "Cdma Subscription set to " + cdmaSubscription);



                //reads the system properties and makes commandsinterface

                String sRILClassname = SystemProperties.get("ro.telephony.ril_class", "RIL");

                Log.i(LOG_TAG, "RILClassname is " + sRILClassname);

                Rlog.i(LOG_TAG, "RILClassname is " + sRILClassname);



                // Use reflection to construct the RIL class (defaults to RIL)

                try {
@@ -131,7 +132,7 @@ public class PhoneFactory { 
                } catch (Exception e) {

                    // 6 different types of exceptions are thrown here that it's

                    // easier to just catch Exception as our "error handling" is the same.

                    Log.wtf(LOG_TAG, "Unable to construct command interface", e);

                    Rlog.i(LOG_TAG, "Unable to construct command interface", e);

                    throw new RuntimeException(e);

                }