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

Commit 114b192a authored by Jay Shrauner's avatar Jay Shrauner Committed by Android Git Automerger
Browse files

am 9e0cb2a3: am 6b70083a: am 44318d37: Merge "Fix NPE crash when mPhone is null" into lmp-dev 

* commit '9e0cb2a3ee60b0b837cb3cbbf84272616f47c879':
  Fix NPE crash when mPhone is null
parents f45a7b44 5b0ec499

telecomm/java/android/telecom/InCallService.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,10 @@ public abstract class InCallService extends Service { 
    private final Handler mHandler = new Handler(Looper.getMainLooper()) {

    private final Handler mHandler = new Handler(Looper.getMainLooper()) {

        @Override

        @Override

        public void handleMessage(Message msg) {

        public void handleMessage(Message msg) {

            if (mPhone == null && msg.what != MSG_SET_IN_CALL_ADAPTER) {

                return;

            }



            switch (msg.what) {

            switch (msg.what) {

                case MSG_SET_IN_CALL_ADAPTER:

                case MSG_SET_IN_CALL_ADAPTER:

                    mPhone = new Phone(new InCallAdapter((IInCallAdapter) msg.obj));

                    mPhone = new Phone(new InCallAdapter((IInCallAdapter) msg.obj));