STK: Check that main menu exists before retrievalandroid-cts-5.1_r2android-cts-5.1_r1android-5.1.1_r6android-5.1.1_r4android-5.1.1_r3android-5.1.1_r2android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1

Bug: 19282177
Change-Id: Ie47020d49abef0c2296b96e5b3a78445e6e44fb6

1 files changed, 1 insertions, 1 deletions

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 @@ public class StkAppService extends Service implements Runnable {
      */
     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;