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

Commit 987760f0 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Flatten DcTracker and DcTrackerBase. 

Nobody else subclassed the parent so it simplifies the code a bit
to combine the two.

Change-Id: I3df96ceca75218712dcb1e87fbac13df5631e534
parent 65573168

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

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import android.text.TextUtils; 


import com.android.ims.ImsManager;

import com.android.internal.R;

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

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

import com.android.internal.telephony.imsphone.ImsPhone;

import com.android.internal.telephony.imsphone.ImsPhoneConnection;

import com.android.internal.telephony.test.SimulatedRadioControl;
@@ -215,7 +215,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
    public CommandsInterface mCi;

    private int mVmCount = 0;

    boolean mDnsCheckDisabled;

    public DcTrackerBase mDcTracker;

    public DcTracker mDcTracker;

    boolean mDoesRilSendMultipleCallRing;

    int mCallRingContinueToken;

    int mCallRingDelay;

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

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ import java.util.ArrayList; 
import java.util.List;

import java.util.concurrent.atomic.AtomicInteger;



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

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

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

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

import com.android.internal.telephony.uicc.IccRecords;
@@ -768,7 +768,7 @@ public abstract class ServiceStateTracker extends Handler { 
     *

     * Hang up the existing voice calls to decrease call drop rate.

     */

    public void powerOffRadioSafely(DcTrackerBase dcTracker) {

    public void powerOffRadioSafely(DcTracker dcTracker) {

        synchronized (this) {

            if (!mPendingRadioPowerOffAfterDataOff) {

                // In some network, deactivate PDP connection cause releasing of RRC connection,

src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java

+2 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import com.android.internal.telephony.TelephonyIntents; 
import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.PhoneFactory;

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

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

import com.android.internal.telephony.PhoneConstants;



import android.telephony.CellInfo;
@@ -49,7 +49,6 @@ import android.os.SystemProperties; 
import android.telephony.Rlog;

import android.util.EventLog;



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

import com.android.internal.telephony.ProxyController;

import android.telephony.SubscriptionManager;

import com.android.internal.telephony.uicc.UiccCardApplication;
@@ -700,7 +699,7 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
     * Hang up the existing voice calls to decrease call drop rate.

     */

    @Override

    public void powerOffRadioSafely(DcTrackerBase dcTracker) {

    public void powerOffRadioSafely(DcTracker dcTracker) {

        synchronized (this) {

            if (!mPendingRadioPowerOffAfterDataOff) {

                int dds = SubscriptionManager.getDefaultDataSubId();

src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ import com.android.internal.telephony.PhoneFactory; 
import com.android.internal.telephony.ServiceStateTracker;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.TelephonyProperties;

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

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

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

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

import com.android.internal.telephony.HbpcdUtils;
@@ -565,7 +565,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker { 
            && mCi.getRadioState() == CommandsInterface.RadioState.RADIO_OFF) {

            mCi.setRadioPower(true, null);

        } else if (!mDesiredPowerState && mCi.getRadioState().isOn()) {

            DcTrackerBase dcTracker = mPhone.mDcTracker;

            DcTracker dcTracker = mPhone.mDcTracker;



            // If it's on and available and we want it off gracefully

            powerOffRadioSafely(dcTracker);

src/java/com/android/internal/telephony/dataconnection/ApnContext.java

+2 −2
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class ApnContext { 
     */

    AtomicBoolean mDependencyMet;



    private final DcTrackerBase mDcTracker;

    private final DcTracker mDcTracker;



    /**

     * Remember this as a change in this value to a more permissive state
@@ -100,7 +100,7 @@ public class ApnContext { 
    private final AtomicInteger mConnectionGeneration = new AtomicInteger(0);



    public ApnContext(Context context, String apnType, String logTag, NetworkConfig config,

            DcTrackerBase tracker) {

            DcTracker tracker) {

        mContext = context;

        mApnType = apnType;

        mState = DctConstants.State.IDLE;