1 files changed, 29 insertions, 15 deletions

diff --git a/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java b/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
index 1dc0f020..4b7c1f89 100644
--- a/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
+++ b/tests/common/src/com/android/tv/testing/uihelper/LiveChannelsUiDeviceHelper.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2017 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.android.tv.testing.uihelper;
 
 import static com.android.tv.testing.uihelper.UiDeviceAsserts.waitForCondition;
@@ -11,31 +26,28 @@ import android.support.test.uiautomator.BySelector;
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.Until;
 import android.util.Log;
-
-import com.android.tv.testing.Utils;
-
+import com.android.tv.common.CommonConstants;
+import com.android.tv.testing.utils.Utils;
 import junit.framework.Assert;
 
-/**
- * Helper for testing the Live TV Application.
- */
+/** Helper for testing the Live TV Application. */
 public class LiveChannelsUiDeviceHelper extends BaseUiDeviceHelper {
     private static final String TAG = "LiveChannelsUiDevice";
     private static final int APPLICATION_START_TIMEOUT_MSEC = 5000;
 
     private final Context mContext;
 
-    public LiveChannelsUiDeviceHelper(UiDevice uiDevice, Resources targetResources,
-            Context context) {
+    public LiveChannelsUiDeviceHelper(
+            UiDevice uiDevice, Resources targetResources, Context context) {
         super(uiDevice, targetResources);
         mContext = context;
     }
 
     public void assertAppStarted() {
         assertTrue("TvActivity should be enabled.", Utils.isTvActivityEnabled(mContext));
-        Intent intent = mContext.getPackageManager()
-                .getLaunchIntentForPackage(Constants.TV_APP_PACKAGE);
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);    // Clear out any previous instances
+        Intent intent =
+                mContext.getPackageManager().getLaunchIntentForPackage(Constants.TV_APP_PACKAGE);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); // Clear out any previous instances
         mContext.startActivity(intent);
         // Wait for idle state before checking the channel banner because waitForCondition() has
         // timeout.
@@ -43,8 +55,10 @@ public class LiveChannelsUiDeviceHelper extends BaseUiDeviceHelper {
         // Make sure that the activity is resumed.
         waitForCondition(mUiDevice, Until.hasObject(Constants.TV_VIEW));
 
-        Assert.assertTrue(Constants.TV_APP_PACKAGE + " did not start", mUiDevice
-                .wait(Until.hasObject(By.pkg(Constants.TV_APP_PACKAGE).depth(0)),
+        Assert.assertTrue(
+            Constants.TV_APP_PACKAGE + " did not start",
+                mUiDevice.wait(
+                        Until.hasObject(By.pkg(Constants.TV_APP_PACKAGE).depth(0)),
                         APPLICATION_START_TIMEOUT_MSEC));
         BySelector welcome = ByResource.id(mTargetResources, com.android.tv.R.id.intro);
         if (mUiDevice.hasObject(welcome)) {
@@ -54,9 +68,9 @@ public class LiveChannelsUiDeviceHelper extends BaseUiDeviceHelper {
     }
 
     public void assertAppStopped() {
-        while(mUiDevice.hasObject(By.pkg(Constants.TV_APP_PACKAGE).depth(0))) {
+        while (mUiDevice.hasObject(By.pkg(CommonConstants.BASE_PACKAGE).depth(0))) {
             mUiDevice.pressBack();
             mUiDevice.waitForIdle();
         }
     }
-}
\ No newline at end of file
+}