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

Commit 640ac806 authored by Wink Saville's avatar Wink Saville Committed by android code review
Browse files

Merge "Telephony: Ignore SipPhone"

parents 4a306f66 073ffbd3

src/java/com/android/internal/telephony/uicc/UiccController.java

+7 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import com.android.internal.telephony.IccCard; 
import com.android.internal.telephony.IccCardStatus;

import com.android.internal.telephony.IccCardStatus.CardState;

import com.android.internal.telephony.PhoneBase;

import com.android.internal.telephony.sip.SipPhone;



import android.os.AsyncResult;

import android.os.Handler;
@@ -132,6 +133,12 @@ public class UiccController extends Handler { 
        }



        if (DBG) log("setNewPhone");

        // TODO: remove this

        if (phone instanceof SipPhone) {

            if (DBG) log("Got SipPhone. Ignore.");

            return;

        }



        if (mCurrentPhone != phone) {

            if (mIccCard != null) {

                // Refresh card if phone changed