commit 468ac247534b1e4681a0a1f11fbbcdca25b84e7e
author dujin.cha <dujin.cha@samsung.com> Mon Nov 21 21:08:36 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 21 21:08:36 2011 -0800
tree 2acc8089bfcb6dc91eed37d03c0aae7c15cdf167
parent 749e018632598754074e8fe00af19460728375fe
parent 2a0eb2acdc369734e1264c8d8f9955d704508b53

am 2a0eb2ac: Update STK application

* commit '2a0eb2acdc369734e1264c8d8f9955d704508b53':
  Update 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 6aa7e9e..9b3252d 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -654,7 +654,7 @@
         Uri data;
         if (settings.url != null) {
             CatLog.d(this, "settings.url = " + settings.url);
-            if (settings.url.startsWith("http://")) {
+            if ((settings.url.startsWith("http://") || (settings.url.startsWith("https://")))) {
                 data = Uri.parse(settings.url);
             } else {
                 String modifiedUrl = "http://" + settings.url;
@@ -710,8 +710,10 @@
 
     private void launchIdleText() {
         TextMessage msg = mCurrentCmd.geTextMessage();
+
         if (msg == null) {
-            CatLog.d(this, "mCurrentCmd.getTextMessage is NULL");
+            CatLog.d(this, "mCurrent.getTextMessage is NULL");
+            mNotificationManager.cancel(STK_NOTIFICATION_ID);
             return;
         }
         if (msg.text == null) {