commit a2d1ad36af53a2c9f55c82c452f47d5b8b7ed70c
author Wink Saville <wink@google.com> Wed Nov 02 03:49:26 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 02 03:49:26 2011 +0000
tree 0ac886b574fed6152aaec3b4bb7f03e8fba5c041
parent a8d13c8fdb5d0ee158a0325838d6996d0b765889
parent dfd14622fab3463c3c62e0d402a3a4251feeee3e

am dfd14622: am 046db4be: Fix NPE in STK application.

* commit 'dfd14622fab3463c3c62e0d402a3a4251feeee3e':
  Fix NPE in STK application.

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index a21b240..aeea186 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -698,6 +698,10 @@
 
     private void launchIdleText() {
         TextMessage msg = mCurrentCmd.geTextMessage();
+        if (msg == null) {
+            CatLog.d(this, "mCurrentCmd.getTextMessage is NULL");
+            return;
+        }
         if (msg.text == null) {
             mNotificationManager.cancel(STK_NOTIFICATION_ID);
         } else {