am a08cffe7: STK: Check that main menu exists before retrieval

* commit 'a08cffe7': STK: Check that main menu exists before retrieval

am a08cffe7: STK: Check that main menu exists before retrieval
* commit 'a08cffe7': STK: Check that main menu exists before retrieval
62684861 · w30234 · Android Git Automerger · ede6aba8 · a08cffe7 · 62684861
Commit 62684861 authored 10 years ago by w30234 Committed by Android Git Automerger 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

src/com/android/stk/StkAppService.java src/com/android/stk/StkAppService.java +1 -1

No files found.
--- 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;