1 files changed, 9 insertions, 12 deletions
diff --git a/src/com/android/tv/ui/AppLayerTvView.java b/src/com/android/tv/ui/AppLayerTvView.java
index 625014ea..b2be9f02 100644
--- a/src/com/android/tv/ui/AppLayerTvView.java
+++ b/src/com/android/tv/ui/AppLayerTvView.java
@@ -21,18 +21,15 @@ import android.media.tv.TvView;
 import android.util.AttributeSet;
 import android.view.SurfaceView;
 import android.view.View;
-
-import com.android.tv.util.Debug;
-import com.android.tv.util.Utils;
+import com.android.tv.common.util.CommonUtils;
+import com.android.tv.common.util.Debug;
 
 /**
  * A TvView class for application layer when multiple windows are being used in the app.
- * <p>
- * Once an app starts using additional window like SubPanel and it gets window focus, the
- * {@link android.media.tv.TvView#setMain()} does not work because its implementation assumes that
- * the app uses only application layer.
- * TODO: remove this class once the TvView.setMain() is revisited.
- * </p>
+ *
+ * <p>Once an app starts using additional window like SubPanel and it gets window focus, the {@link
+ * android.media.tv.TvView#setMain()} does not work because its implementation assumes that the app
+ * uses only application layer. TODO: remove this class once the TvView.setMain() is revisited.
  */
 public class AppLayerTvView extends TvView {
     public AppLayerTvView(Context context) {
@@ -56,7 +53,7 @@ public class AppLayerTvView extends TvView {
     public void onViewAdded(View child) {
         if (child instanceof SurfaceView) {
             // Note: See b/29118070 for detail.
-            ((SurfaceView) child).setSecure(!Utils.isDeveloper());
+            ((SurfaceView) child).setSecure(!CommonUtils.isDeveloper());
         }
         super.onViewAdded(child);
     }
@@ -66,7 +63,7 @@ public class AppLayerTvView extends TvView {
         super.getLocationOnScreen(outLocation);
 
         // The TvView.MySessionCallback.onSessionCreated() will call this method indirectly.
-        Debug.getTimer(Debug.TAG_START_UP_TIMER).log(
-                "AppLayerTvView.getLocationOnScreen, session created");
+        Debug.getTimer(Debug.TAG_START_UP_TIMER)
+                .log("AppLayerTvView.getLocationOnScreen, session created");
     }
 }