commit 2ba20ccc8a92d118ac2b82aa39c9b194859f9539
author Ryuto Sawada <ryuto.x.sawada@sonymobile.com> Mon Dec 28 17:10:35 2015 +0100
committer Zoran Jovanovic <zoran.jovanovic@sonymobile.com> Mon Dec 28 17:11:04 2015 +0100
tree e50c1b11f24f94804bd35154eeca044b093e75a3
parent ed8ebb59a5d34863fd6ed1bd3f63d9c4040a5b52

Empty toast should not be displayed

Empty toast is displayed when empty alpha identifier is specified.
If msg.txt is null, it should not be displayed.

Change-Id: I212e922a0bc4a07a8598607e320c317f86eeece3

src/com/android/stk/StkAppService.java

diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 0b19f9e..c9a352b 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -1416,7 +1416,7 @@
     }
 
     private void launchEventMessage(int slotId, TextMessage msg) {
-        if (msg == null || (msg.text != null && msg.text.length() == 0)) {
+        if (msg == null || msg.text == null || (msg.text != null && msg.text.length() == 0)) {
             CatLog.d(LOG_TAG, "launchEventMessage return");
             return;
         }