tv/framework: optimize getCurrentSignalType in DroidLogicTvUtils.[1/3]

PD# 156893

optimize getCurrentSignalType in DroidLogicTvUtils.

Change-Id: I2de5ab707c0394ddc5a0f47e1bc51d94935216d0

2 files changed, 11 insertions, 31 deletions

diff --git a/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java b/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java
index 5819d28..bb59110 100644
--- a/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java
+++ b/core/java/com/droidlogic/app/tv/DroidLogicTvUtils.java
@@ -264,13 +264,7 @@ public class DroidLogicTvUtils
     public static final String TV_KEY_DTV_NUMBER_MODE = "tv_dtv_number_mode";
     public static final String TV_KEY_DTV_TYPE = "tv_dtv_type";
 
-    public static final String SIGNAL_TYPE_AIR = "air";
-    public static final String SIGNAL_TYPE_CABLE = "cable";
-    public static final String SIGNAL_TYPE_DTMB = "dtmb";
-    public static final String SIGNAL_TYPE_DVB_C = "dvb-c";
-    public static final String SIGNAL_TYPE_DVB_T = "dvb-t";
-    public static final String SIGNAL_TYPE_DVB_T2 = "dvb-t2";
-    public static final String SIGNAL_TYPE_ISDB_T = "isdb-t";
+    public static final String SIGNAL_TYPE_ERROR = "error";
     public static final String ALL_CHANNELS_NUMBER = "all_channels_number";
     public static final String DTV_TYPE_SWITCHED = "dtv_type_switched";
 
@@ -297,29 +291,13 @@ public class DroidLogicTvUtils
     }
 
     public static String getCurrentSignalType(Context context) {
-        String mCurrentSignalType = Settings.System.getString(context.getContentResolver(), DroidLogicTvUtils.TV_KEY_DTV_TYPE);
-        if (mCurrentSignalType == null) {
-            mCurrentSignalType = TvContract.Channels.TYPE_ATSC_T;
-            Settings.System.putString(context.getContentResolver(), DroidLogicTvUtils.TV_KEY_DTV_TYPE, mCurrentSignalType);
+        String dtvType = Settings.System.getString(context.getContentResolver(), DroidLogicTvUtils.TV_KEY_DTV_TYPE);
+        if (dtvType == null) {
+            return DroidLogicTvUtils.SIGNAL_TYPE_ERROR;
+        } else {
+            Log.d(TAG, "getCurrentSignalType = " + dtvType);
+            return dtvType;
         }
-
-        if (mCurrentSignalType.equals(TvContract.Channels.TYPE_ATSC_T)) {
-          mCurrentSignalType = DroidLogicTvUtils.SIGNAL_TYPE_AIR;
-        } else if (mCurrentSignalType.equals(TvContract.Channels.TYPE_ATSC_C)) {
-          mCurrentSignalType = DroidLogicTvUtils.SIGNAL_TYPE_CABLE;
-        } else if (mCurrentSignalType.equals(TvContract.Channels.TYPE_DTMB)) {
-          mCurrentSignalType = DroidLogicTvUtils.SIGNAL_TYPE_DTMB;
-        } else if (mCurrentSignalType.equals(TvContract.Channels.TYPE_DVB_C)) {
-          mCurrentSignalType = DroidLogicTvUtils.SIGNAL_TYPE_DVB_C;
-        } else if (mCurrentSignalType.equals(TvContract.Channels.TYPE_DVB_T)) {
-          mCurrentSignalType = DroidLogicTvUtils.SIGNAL_TYPE_DVB_T;
-        } else if (mCurrentSignalType.equals(TvContract.Channels.TYPE_DVB_T2)) {
-          mCurrentSignalType = DroidLogicTvUtils.SIGNAL_TYPE_DVB_T2;
-        } else if (mCurrentSignalType.equals(TvContract.Channels.TYPE_ISDB_T)) {
-          mCurrentSignalType = DroidLogicTvUtils.SIGNAL_TYPE_ISDB_T;
-        }
-        Log.d(TAG, "getCurrentSignalType = " + mCurrentSignalType);
-        return mCurrentSignalType;
     }
 
     public static int matchsWhich(Uri uri) {
diff --git a/core/java/com/droidlogic/app/tv/TvStoreManager.java b/core/java/com/droidlogic/app/tv/TvStoreManager.java
index 559c5c8..782271a 100644
--- a/core/java/com/droidlogic/app/tv/TvStoreManager.java
+++ b/core/java/com/droidlogic/app/tv/TvStoreManager.java
@@ -252,7 +252,8 @@ public abstract class TvStoreManager {
                .setHidden(event.hidden)
                .setHideGuide(event.hideGuide)
                .setVct(event.vct)
-               .setSignalType(DroidLogicTvUtils.getCurrentSignalType(mContext))
+               .setSignalType(DroidLogicTvUtils.getCurrentSignalType(mContext) == DroidLogicTvUtils.SIGNAL_TYPE_ERROR
+                ? TvContract.Channels.TYPE_ATSC_T : DroidLogicTvUtils.getCurrentSignalType(mContext))
                .build();
     }
 
@@ -330,7 +331,8 @@ public abstract class TvStoreManager {
                .setHidden(event.hidden)
                .setHideGuide(event.hideGuide)
                .setContentRatings(null)
-               .setSignalType(DroidLogicTvUtils.getCurrentSignalType(mContext))
+               .setSignalType(DroidLogicTvUtils.getCurrentSignalType(mContext) == DroidLogicTvUtils.SIGNAL_TYPE_ERROR
+                ? TvContract.Channels.TYPE_ATSC_T : DroidLogicTvUtils.getCurrentSignalType(mContext))
                .build();
     }