Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix for phone app crash in Icc Card."

Browse Source
This commit is contained in:
Wink Saville
2010-12-09 13:50:28 -08:00
committed by Android Code Review
parent 7f7474ddd6 cc7605ce61
commit 19b23afadf
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telephony/java/com/android/internal/telephony/IccCard.java
View File

@@ -487,6 +487,12 @@ public abstract class IccCard {
CommandsInterface.SERVICE_CLASS_DATA +
CommandsInterface.SERVICE_CLASS_FAX;
if (!mPhone.mIsTheCurrentActivePhone) {
Log.e(mLogTag, "Received message " + msg + "[" + msg.what
+ "] while being destroyed. Ignoring.");
return;
}
switch (msg.what) {
case EVENT_RADIO_OFF_OR_NOT_AVAILABLE:
mState = null;
@@ -626,7 +632,13 @@ public abstract class IccCard {
index = mIccCardStatus.getGsmUmtsSubscriptionAppIndex();
}
IccCardApplication app = mIccCardStatus.getApplication(index);
IccCardApplication app;
if (index >= 0 && index < IccCardStatus.CARD_MAX_APPS) {
app = mIccCardStatus.getApplication(index);
} else {
Log.e(mLogTag, "[IccCard] Invalid Subscription Application index:" + index);
return IccCard.State.ABSENT;
}
if (app == null) {
Log.e(mLogTag, "[IccCard] Subscription Application in not present");