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

Commit 61759138 authored by Ethan Chen's avatar Ethan Chen
Browse files

telephony: Fix initialization ordering of SMS middleware 

* For an unknown reason the IccSmsInterfaceManager reference first
  passed to the proxy is null, re-register that reference after the
  reference has been initialized.

Change-Id: I4028fc311b2c54b8022d036c23938a5701e0390d
parent cc648d4d

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

+3 −2
Original line number Diff line number Diff line
@@ -95,11 +95,12 @@ public class PhoneProxy extends Handler implements Phone { 
    }



    protected void init() {

        mIccSmsInterfaceManagerProxy =

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

        mIccSmsInterfaceManager =

                new IccSmsInterfaceManager((PhoneBase)this.mActivePhone);

        mIccSmsInterfaceManagerProxy.setmIccSmsInterfaceManager(mIccSmsInterfaceManager);

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

        mIccSmsInterfaceManagerProxy =

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

    }



    @Override