commit 97503264db52c3bb23b436546390aba171c8e757
author Pierre Fröjd <pierre.frojd.x@sonyericsson.com> Mon Nov 08 13:59:36 2010 +0100
committer Johan Redestig <johan.redestig@sonyericsson.com> Mon Nov 08 14:13:58 2010 +0100
tree 8d4a12546c6cc7165c133d2eafc682b08da76fc7
parent d41f1d98d7bf42e9e867819593ad79f685604796

Fixing a Monkey crash in Stk.

Monkey test has reports nullpointer exception in
the RES_ID_INPUT case. Added a null check to avoid
future exceptions.

Change-Id: I489e3f389d9f37aa8f48eee399ee32ed5967b33e

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index ec7fd50..a21b240 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -40,6 +40,7 @@
 import com.android.internal.telephony.cat.AppInterface;
 import com.android.internal.telephony.cat.Menu;
 import com.android.internal.telephony.cat.Item;
+import com.android.internal.telephony.cat.Input;
 import com.android.internal.telephony.cat.ResultCode;
 import com.android.internal.telephony.cat.CatCmdMessage;
 import com.android.internal.telephony.cat.CatCmdMessage.BrowserSettings;
@@ -477,7 +478,8 @@
         case RES_ID_INPUT:
             CatLog.d(this, "RES_ID_INPUT");
             String input = args.getString(INPUT);
-            if (mCurrentCmd.geInput().yesNo) {
+            Input cmdInput = mCurrentCmd.geInput();
+            if (cmdInput != null && cmdInput.yesNo) {
                 boolean yesNoSelection = input
                         .equals(StkInputActivity.YES_STR_RESPONSE);
                 resMsg.setYesNo(yesNoSelection);