diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-16 14:43:20 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-16 14:43:20 -0800 |
| commit | 49e196b52220fa82150b05e978232e539121d992 (patch) | |
| tree | 9e9032e7acb9b8fe7003e1ec63242c24f01d74f8 | |
| parent | aec33934567035c88d248b626cd136bed36b7075 (diff) | |
| parent | 69b459742414fa96224b6ebc7af5092587a4eaee (diff) | |
| download | android_packages_apps_Stk-49e196b52220fa82150b05e978232e539121d992.tar.gz android_packages_apps_Stk-49e196b52220fa82150b05e978232e539121d992.tar.bz2 android_packages_apps_Stk-49e196b52220fa82150b05e978232e539121d992.zip | |
Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/packages/apps/Stk into cm-13.0
| -rw-r--r-- | src/com/android/stk/StkLauncherActivity.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/stk/StkLauncherActivity.java b/src/com/android/stk/StkLauncherActivity.java index f3803bc..0069c0f 100644 --- a/src/com/android/stk/StkLauncherActivity.java +++ b/src/com/android/stk/StkLauncherActivity.java @@ -164,11 +164,16 @@ public class StkLauncherActivity extends ListActivity { String stkItemName = null; int simCount = TelephonyManager.from(mContext).getSimCount(); mStkMenuList = new ArrayList<Item>(); + StkAppService appService = StkAppService.getInstance(); CatLog.d(LOG_TAG, "simCount: " + simCount); for (int i = 0; i < simCount; i++) { //Check if the card is inserted. if (mTm.hasIccCard(i)) { + if(appService == null || appService.getMainMenu(i) == null) { + CatLog.d(LOG_TAG, "SIM " + i + " main menu of STK in the card is null"); + continue; + } CatLog.d(LOG_TAG, "SIM " + i + " add to menu."); mSingleSimId = i; stkItemName = new StringBuilder(appName).append(" ") |