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

am 19b23afa: Merge "Fix for phone app crash in Icc Card."

Browse Source 
* commit '19b23afadf1053a8e06cb3444d9cdae3405ad9a1':
  Fix for phone app crash in Icc Card.
This commit is contained in:
Wink Saville
2010-12-09 13:58:26 -08:00
committed by Android Git Automerger
parent d9c17cc117 19b23afadf
commit d0ffef4b43
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_DATA +
CommandsInterface.SERVICE_CLASS_FAX; CommandsInterface.SERVICE_CLASS_FAX;
if (!mPhone.mIsTheCurrentActivePhone) {
Log.e(mLogTag, "Received message " + msg + "[" + msg.what
+ "] while being destroyed. Ignoring.");
return;
}
switch (msg.what) { switch (msg.what) {
case EVENT_RADIO_OFF_OR_NOT_AVAILABLE: case EVENT_RADIO_OFF_OR_NOT_AVAILABLE:
mState = null; mState = null;
@@ -626,7 +632,13 @@ public abstract class IccCard {
index = mIccCardStatus.getGsmUmtsSubscriptionAppIndex(); 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) { if (app == null) {
Log.e(mLogTag, "[IccCard] Subscription Application in not present"); Log.e(mLogTag, "[IccCard] Subscription Application in not present");