diff options
| author | Alex Yakavenka <ayakav@codeaurora.org> | 2012-08-15 14:47:37 -0700 |
|---|---|---|
| committer | Alex Yakavenka <ayakav@codeaurora.org> | 2012-08-15 15:36:35 -0700 |
| commit | 073ffbd395b7c3942c75a0880cafd1ddb84b4b07 (patch) | |
| tree | 74e1eaa68974250e0ab31624e6106a98f5fd69c1 /src | |
| parent | 4a306f66962aabf843ce883a8f96450389db5f7a (diff) | |
| download | frameworks_opt_telephony-073ffbd395b7c3942c75a0880cafd1ddb84b4b07.zip frameworks_opt_telephony-073ffbd395b7c3942c75a0880cafd1ddb84b4b07.tar.gz frameworks_opt_telephony-073ffbd395b7c3942c75a0880cafd1ddb84b4b07.tar.bz2 | |
Telephony: Ignore SipPhone
UiccController's code isn't ready to handle having multiple
different PhoneBase objects working at the same time
Bug: 6975696
Change-Id: I8f83174cc7db478743445c09fb8f03c66cf1e41e
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/com/android/internal/telephony/uicc/UiccController.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/java/com/android/internal/telephony/uicc/UiccController.java b/src/java/com/android/internal/telephony/uicc/UiccController.java index 211dad6..53a222e 100644 --- a/src/java/com/android/internal/telephony/uicc/UiccController.java +++ b/src/java/com/android/internal/telephony/uicc/UiccController.java @@ -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 |