DTVCC: avoid null pointer issue [1/1]

PD# none

Change-Id: I63d1a401a5a4a1a114027cd3bdb463692ab9ded2

2 files changed, 6 insertions, 4 deletions

diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/widget/CcImplement.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/widget/CcImplement.java
index 0f18230..902628c 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/widget/CcImplement.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/widget/CcImplement.java
@@ -11,6 +11,7 @@ import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.graphics.Xfermode;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.accessibility.CaptioningManager;
@@ -393,7 +394,7 @@ public class CcImplement {
             style_use_broadcast = isStyle_use_broadcast();
             init_flag = false;
             try {
-                if (jsonStr != null && !jsonStr.isEmpty())
+                if (!TextUtils.isEmpty(jsonStr))
                     ccObj = new JSONObject(jsonStr);
                 else {
                     return;
diff --git a/DroidLogicTvInput/src/com/droidlogic/tvinput/widget/DTVSubtitleView.java b/DroidLogicTvInput/src/com/droidlogic/tvinput/widget/DTVSubtitleView.java
index 7f8ef3b..ef28429 100644
--- a/DroidLogicTvInput/src/com/droidlogic/tvinput/widget/DTVSubtitleView.java
+++ b/DroidLogicTvInput/src/com/droidlogic/tvinput/widget/DTVSubtitleView.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
+import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.view.KeyEvent;
 import android.view.View;
@@ -841,11 +842,11 @@ public class DTVSubtitleView extends View {
         Paint clear_paint = new Paint();
         clear_paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.CLEAR));
         canvas.drawPaint(clear_paint);
-        if (!json_str.isEmpty()) {
+        if (!TextUtils.isEmpty(json_str)) {
             synchronized (json_lock) {
                 json_data = new String(json_str);
             }
-            if (!json_data.isEmpty() && ci != null) {
+            if (!TextUtils.isEmpty(json_data) && ci != null) {
                 CcImplement.CaptionWindow captionWindow = ci.new CaptionWindow(json_data);
                 captionWindow.draw(canvas);
             }
@@ -884,7 +885,7 @@ public class DTVSubtitleView extends View {
     public void saveJsonStr(String str) {
         if (activeView != this)
             return;
-        if (!str.isEmpty()) {
+        if (!TextUtils.isEmpty(str)) {
             synchronized (json_lock) {
                 json_str = str;
             }