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

Commit 46217055 authored by Youming Ye's avatar Youming Ye Committed by Gerrit Code Review
Browse files

Merge "Inject telephony component facotry using jar"

parents 888fef90 b7d6cda1

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

+29 −15
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.telephony.cdma.CdmaMmiCode;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

import com.android.internal.telephony.cdma.EriManager;

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

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

import com.android.internal.telephony.emergency.EmergencyNumberTracker;

import com.android.internal.telephony.gsm.GsmMmiCode;
@@ -226,22 +227,29 @@ public class GsmCdmaPhone extends Phone { 
        initRatSpecific(precisePhoneType);

        // CarrierSignalAgent uses CarrierActionAgent in construction so it needs to be created

        // after CarrierActionAgent.

        mCarrierActionAgent = mTelephonyComponentFactory.makeCarrierActionAgent(this);

        mCarrierSignalAgent = mTelephonyComponentFactory.makeCarrierSignalAgent(this);

        mTransportManager = mTelephonyComponentFactory.makeTransportManager(this);

        mSST = mTelephonyComponentFactory.makeServiceStateTracker(this, this.mCi);

        mEmergencyNumberTracker = mTelephonyComponentFactory.makeEmergencyNumberTracker(

        mCarrierActionAgent = mTelephonyComponentFactory.inject(CarrierActionAgent.class.getName())

                .makeCarrierActionAgent(this);

        mCarrierSignalAgent = mTelephonyComponentFactory.inject(CarrierSignalAgent.class.getName())

                .makeCarrierSignalAgent(this);

        mTransportManager = mTelephonyComponentFactory.inject(TransportManager.class.getName())

                .makeTransportManager(this);

        mSST = mTelephonyComponentFactory.inject(ServiceStateTracker.class.getName())

                .makeServiceStateTracker(this, this.mCi);

        mEmergencyNumberTracker = mTelephonyComponentFactory

                .inject(EmergencyNumberTracker.class.getName()).makeEmergencyNumberTracker(

                this, this.mCi);

        // DcTracker uses SST so needs to be created after it is instantiated

        for (int transport : mTransportManager.getAvailableTransports()) {

            mDcTrackers.put(transport, mTelephonyComponentFactory.makeDcTracker(this,

                    transport));

            mDcTrackers.put(transport, mTelephonyComponentFactory.inject(DcTracker.class.getName())

                    .makeDcTracker(this, transport));

        }



        mCarrierResolver = mTelephonyComponentFactory.makeCarrierResolver(this);

        mCarrierResolver = mTelephonyComponentFactory.inject(CarrierResolver.class.getName())

                .makeCarrierResolver(this);



        mSST.registerForNetworkAttached(this, EVENT_REGISTERED_TO_NETWORK, null);

        mDeviceStateMonitor = mTelephonyComponentFactory.makeDeviceStateMonitor(this);

        mDeviceStateMonitor = mTelephonyComponentFactory.inject(DeviceStateMonitor.class.getName())

                .makeDeviceStateMonitor(this);



        mSST.registerForVoiceRegStateOrRatChanged(this, EVENT_VRS_OR_RAT_CHANGED, null);

        logd("GsmCdmaPhone: constructor: sub = " + mPhoneId);
@@ -262,12 +270,17 @@ public class GsmCdmaPhone extends Phone { 
            mSimulatedRadioControl = (SimulatedRadioControl) ci;

        }



        mCT = mTelephonyComponentFactory.makeGsmCdmaCallTracker(this);

        mIccPhoneBookIntManager = mTelephonyComponentFactory.makeIccPhoneBookInterfaceManager(this);

        mCT = mTelephonyComponentFactory.inject(GsmCdmaCallTracker.class.getName())

                .makeGsmCdmaCallTracker(this);

        mIccPhoneBookIntManager = mTelephonyComponentFactory

                .inject(IccPhoneBookInterfaceManager.class.getName())

                .makeIccPhoneBookInterfaceManager(this);

        PowerManager pm

                = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);

        mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, LOG_TAG);

        mIccSmsInterfaceManager = mTelephonyComponentFactory.makeIccSmsInterfaceManager(this);

        mIccSmsInterfaceManager = mTelephonyComponentFactory

                .inject(IccSmsInterfaceManager.class.getName())

                .makeIccSmsInterfaceManager(this);



        mCi.registerForAvailable(this, EVENT_RADIO_AVAILABLE, null);

        mCi.registerForOffOrNotAvailable(this, EVENT_RADIO_OFF_OR_NOT_AVAILABLE, null);
@@ -280,10 +293,11 @@ public class GsmCdmaPhone extends Phone { 
        mCi.setOnSs(this, EVENT_SS, null);



        //CDMA

        mCdmaSSM = mTelephonyComponentFactory.getCdmaSubscriptionSourceManagerInstance(mContext,

        mCdmaSSM = mTelephonyComponentFactory.inject(CdmaSubscriptionSourceManager.class.getName())

                .getCdmaSubscriptionSourceManagerInstance(mContext,

                mCi, this, EVENT_CDMA_SUBSCRIPTION_SOURCE_CHANGED, null);

        mEriManager = mTelephonyComponentFactory.makeEriManager(this, mContext,

                EriManager.ERI_FROM_XML);

        mEriManager = mTelephonyComponentFactory.inject(EriManager.class.getName())

                .makeEriManager(this, mContext, EriManager.ERI_FROM_XML);

        mCi.setEmergencyCallbackMode(this, EVENT_EMERGENCY_CALLBACK_MODE_ENTER, null);

        mCi.registerForExitEmergencyCallbackMode(this, EVENT_EXIT_EMERGENCY_CALLBACK_RESPONSE,

                null);

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

+8 −5
Original line number Diff line number Diff line
@@ -259,7 +259,8 @@ public abstract class InboundSmsHandler extends StateMachine { 
        mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, name);

        mWakeLock.acquire();    // wake lock released after we enter idle state

        mUserManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);

        mDeviceIdleController = TelephonyComponentFactory.getInstance().getIDeviceIdleController();

        mDeviceIdleController = TelephonyComponentFactory.getInstance()

                .inject(IDeviceIdleController.class.getName()).getIDeviceIdleController();



        addState(mDefaultState);

        addState(mStartupState, mDefaultState);
@@ -719,8 +720,9 @@ public abstract class InboundSmsHandler extends StateMachine { 
                destPort = smsHeader.portAddrs.destPort;

                if (DBG) log("destination port: " + destPort);

            }



            tracker = TelephonyComponentFactory.getInstance().makeInboundSmsTracker(sms.getPdu(),

            tracker = TelephonyComponentFactory.getInstance()

                    .inject(InboundSmsTracker.class.getName())

                    .makeInboundSmsTracker(sms.getPdu(),

                    sms.getTimestampMillis(), destPort, is3gpp2(), false,

                    sms.getOriginatingAddress(), sms.getDisplayOriginatingAddress(),

                    sms.getMessageBody());
@@ -729,8 +731,9 @@ public abstract class InboundSmsHandler extends StateMachine { 
            SmsHeader.ConcatRef concatRef = smsHeader.concatRef;

            SmsHeader.PortAddrs portAddrs = smsHeader.portAddrs;

            int destPort = (portAddrs != null ? portAddrs.destPort : -1);



            tracker = TelephonyComponentFactory.getInstance().makeInboundSmsTracker(sms.getPdu(),

            tracker = TelephonyComponentFactory.getInstance()

                    .inject(InboundSmsTracker.class.getName())

                    .makeInboundSmsTracker(sms.getPdu(),

                    sms.getTimestampMillis(), destPort, is3gpp2(), sms.getOriginatingAddress(),

                    sms.getDisplayOriginatingAddress(), concatRef.refNumber, concatRef.seqNumber,

                    concatRef.msgCount, false, sms.getMessageBody());

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

+9 −4
Original line number Diff line number Diff line
@@ -485,7 +485,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        mCi = ci;

        mActionDetached = this.getClass().getPackage().getName() + ".action_detached";

        mActionAttached = this.getClass().getPackage().getName() + ".action_attached";

        mAppSmsManager = telephonyComponentFactory.makeAppSmsManager(context);

        mAppSmsManager = telephonyComponentFactory.inject(AppSmsManager.class.getName())

                .makeAppSmsManager(context);



        if (Build.IS_DEBUGGABLE) {

            mTelephonyTester = new TelephonyTester(this);
@@ -547,11 +548,15 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 


        // Initialize device storage and outgoing SMS usage monitors for SMSDispatchers.

        mTelephonyComponentFactory = telephonyComponentFactory;

        mSmsStorageMonitor = mTelephonyComponentFactory.makeSmsStorageMonitor(this);

        mSmsUsageMonitor = mTelephonyComponentFactory.makeSmsUsageMonitor(context);

        mSmsStorageMonitor = mTelephonyComponentFactory.inject(SmsStorageMonitor.class.getName())

                .makeSmsStorageMonitor(this);

        mSmsUsageMonitor = mTelephonyComponentFactory.inject(SmsUsageMonitor.class.getName())

                .makeSmsUsageMonitor(context);

        mUiccController = UiccController.getInstance();

        mUiccController.registerForIccChanged(this, EVENT_ICC_CHANGED, null);

        mSimActivationTracker = mTelephonyComponentFactory.makeSimActivationTracker(this);

        mSimActivationTracker = mTelephonyComponentFactory

                .inject(SimActivationTracker.class.getName())

                .makeSimActivationTracker(this);

        if (getPhoneType() != PhoneConstants.PHONE_TYPE_SIP) {

            mCi.registerForSrvccStateChanged(this, EVENT_SRVCC_STATE_CHANGED, null);

        }

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

+6 −4
Original line number Diff line number Diff line
@@ -494,7 +494,9 @@ public class ServiceStateTracker extends Handler { 
    private static final int INVALID_LTE_EARFCN = -1;



    public ServiceStateTracker(GsmCdmaPhone phone, CommandsInterface ci) {

        mNitzState = TelephonyComponentFactory.getInstance().makeNitzStateMachine(phone);

        mNitzState = TelephonyComponentFactory.getInstance()

                .inject(NitzStateMachine.class.getName())

                .makeNitzStateMachine(phone);

        mPhone = phone;

        mCi = ci;
@@ -522,9 +524,9 @@ public class ServiceStateTracker extends Handler { 
            mRegStateManagers.get(transportType).registerForNetworkRegistrationStateChanged(

                    this, EVENT_NETWORK_STATE_CHANGED, null);

        }



        mLocaleTracker = TelephonyComponentFactory.getInstance().makeLocaleTracker(

                mPhone, mNitzState, getLooper());

        mLocaleTracker = TelephonyComponentFactory.getInstance()

                .inject(LocaleTracker.class.getName())

                .makeLocaleTracker(mPhone, mNitzState, getLooper());



        mCi.registerForImsNetworkStateChanged(this, EVENT_IMS_STATE_CHANGED, null);

        mCi.registerForRadioStateChanged(this, EVENT_RADIO_STATE_CHANGED, null);

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

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ public class SmsBroadcastUndelivered { 
            while (cursor.moveToNext()) {

                InboundSmsTracker tracker;

                try {

                    tracker = TelephonyComponentFactory.getInstance().makeInboundSmsTracker(cursor,

                    tracker = TelephonyComponentFactory.getInstance()

                            .inject(InboundSmsTracker.class.getName()).makeInboundSmsTracker(cursor,

                            isCurrentFormat3gpp2);

                } catch (IllegalArgumentException e) {

                    Rlog.e(TAG, "error loading SmsTracker: " + e);