1 files changed, 6 insertions, 4 deletions
diff --git a/tuner/src/com/android/tv/tuner/tvinput/TunerSessionOverlay.java b/tuner/src/com/android/tv/tuner/tvinput/TunerSessionOverlay.java
index 53e0bcc2..9f21e16a 100644
--- a/tuner/src/com/android/tv/tuner/tvinput/TunerSessionOverlay.java
+++ b/tuner/src/com/android/tv/tuner/tvinput/TunerSessionOverlay.java
@@ -26,18 +26,17 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 import android.widget.Toast;
-
+import com.android.tv.common.util.SystemPropertiesProxy;
 import com.android.tv.tuner.R;
 import com.android.tv.tuner.cc.CaptionLayout;
 import com.android.tv.tuner.cc.CaptionTrackRenderer;
 import com.android.tv.tuner.data.Cea708Data.CaptionEvent;
-import com.android.tv.tuner.data.Track.AtscCaptionTrack;
+import com.android.tv.tuner.data.nano.Track.AtscCaptionTrack;
 import com.android.tv.tuner.util.GlobalSettingsUtils;
 import com.android.tv.tuner.util.StatusTextUtils;
 
 /** Executes {@link Session} overlay changes on the main thread. */
 /* package */ final class TunerSessionOverlay implements Handler.Callback {
-    private static final boolean DEBUG = false;
 
     /** Displays the given {@link String} message object in the message view. */
     public static final int MSG_UI_SHOW_MESSAGE = 1;
@@ -68,6 +67,8 @@ import com.android.tv.tuner.util.StatusTextUtils;
     /** Displays a toast signalling that a re-scan is required. Does not expect a message object. */
     public static final int MSG_UI_TOAST_RESCAN_NEEDED = 11;
 
+    private static final String USBTUNER_SHOW_DEBUG = "persist.tv.tuner.show_debug";
+
     private final Context mContext;
     private final Handler mHandler;
     private final View mOverlayView;
@@ -87,12 +88,13 @@ import com.android.tv.tuner.util.StatusTextUtils;
         mHandler = new Handler(this);
         LayoutInflater inflater =
                 (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        boolean showDebug = SystemPropertiesProxy.getBoolean(USBTUNER_SHOW_DEBUG, false);
         mOverlayView = inflater.inflate(R.layout.ut_overlay_view, null);
         mMessageLayout = mOverlayView.findViewById(R.id.message_layout);
         mMessageLayout.setVisibility(View.INVISIBLE);
         mMessageView = mOverlayView.findViewById(R.id.message);
         mStatusView = mOverlayView.findViewById(R.id.tuner_status);
-        mStatusView.setVisibility(DEBUG ? View.VISIBLE : View.INVISIBLE);
+        mStatusView.setVisibility(showDebug ? View.VISIBLE : View.INVISIBLE);
         mAudioStatusView = mOverlayView.findViewById(R.id.audio_status);
         mAudioStatusView.setVisibility(View.INVISIBLE);
         CaptionLayout captionLayout = mOverlayView.findViewById(R.id.caption);