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

Commit 540271f3 authored by Steve Kondik's avatar Steve Kondik
Browse files

telephony: Fix initialization order of SMS proxy 

 * This was getting initialized too early, propogating a null
   thru the stack.

Change-Id: I1ee371eea8ee3311ae1809fd9347b42e6e6b8979
parent e7fc7c06

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

+2 −3
Original line number Diff line number Diff line
@@ -79,9 +79,6 @@ public class PhoneProxy extends Handler implements Phone { 
        mPhoneSubInfoProxy = new PhoneSubInfoProxy(phone.getPhoneSubInfo());

        mCommandsInterface = ((PhoneBase)mActivePhone).mCi;



        mIccSmsInterfaceManagerProxy =

            new IccSmsInterfaceManagerProxy(mActivePhone.getContext(), mIccSmsInterfaceManager);



        mCommandsInterface.registerForRilConnected(this, EVENT_RIL_CONNECTED, null);

        mCommandsInterface.registerForOn(this, EVENT_RADIO_ON, null);

        mCommandsInterface.registerForVoiceRadioTechChanged(
@@ -101,6 +98,8 @@ public class PhoneProxy extends Handler implements Phone { 
        mIccSmsInterfaceManager =

                new IccSmsInterfaceManager((PhoneBase)this.mActivePhone);

        mIccCardProxy = new IccCardProxy(mActivePhone.getContext(), mCommandsInterface);

        mIccSmsInterfaceManagerProxy =

                new IccSmsInterfaceManagerProxy(mActivePhone.getContext(), mIccSmsInterfaceManager);

    }



    @Override