summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorPierre Fröjd <pierre.frojd.x@sonyericsson.com>2010-11-08 13:59:36 +0100
committerJohan Redestig <johan.redestig@sonyericsson.com>2010-11-08 14:13:58 +0100
commit97503264db52c3bb23b436546390aba171c8e757 (patch)
tree8d4a12546c6cc7165c133d2eafc682b08da76fc7 /src/com/android
parentd41f1d98d7bf42e9e867819593ad79f685604796 (diff)
downloadpackages_apps_Stk-97503264db52c3bb23b436546390aba171c8e757.zip
packages_apps_Stk-97503264db52c3bb23b436546390aba171c8e757.tar.gz
packages_apps_Stk-97503264db52c3bb23b436546390aba171c8e757.tar.bz2
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
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/stk/StkAppService.java4
1 files changed, 3 insertions, 1 deletions
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 android.widget.Toast;
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 @@ public class StkAppService extends Service implements Runnable {
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);