Merge "Avoid logging text string specified in DISPLAY TEXT command"
diff --git a/src/com/android/stk/StkDialogActivity.java b/src/com/android/stk/StkDialogActivity.java
index daa2ff3..283ae09 100644
--- a/src/com/android/stk/StkDialogActivity.java
+++ b/src/com/android/stk/StkDialogActivity.java
@@ -30,6 +30,7 @@
 import android.content.DialogInterface;
 import android.view.KeyEvent;
 
+import android.os.Build;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.text.TextUtils;
@@ -342,7 +343,8 @@
             finish();
         }
 
-        CatLog.d(LOG_TAG, "initFromIntent - [" + mTextMsg + "], sim id: " + mSlotId);
+        CatLog.d(LOG_TAG, "initFromIntent - [" + (Build.IS_DEBUGGABLE ? mTextMsg : "********")
+                + "], slot id: " + mSlotId);
     }
 
     private void cancelTimeOut() {