commit 8f86843a3773a9eb03b4d4beabd2ce3c654f4113
author w30234 <w30234@motorola.com> Wed Feb 04 15:13:25 2015 -0800
committer The Android Automerger <android-build@google.com> Fri Feb 06 17:59:55 2015 -0800
tree 8e9a2389abacc4d247b0061c4c73bd9ddbb8277e
parent c32560e69a3dc13ad96287629271002c6d02c9f9

STK: Check that main menu exists before retrieval

Bug: 19282177
Change-Id: Ie47020d49abef0c2296b96e5b3a78445e6e44fb6

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 7410f81..1714d6d 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -432,7 +432,7 @@
      */
     Menu getMainMenu(int slotId) {
         CatLog.d(LOG_TAG, "StkAppService, getMainMenu, sim id: " + slotId);
-        if (slotId >=0 && slotId < mSimCount) {
+        if (slotId >=0 && slotId < mSimCount && (mStkContext[slotId].mMainCmd != null)) {
             return mStkContext[slotId].mMainCmd.getMenu();
         } else {
             return null;