diff options
Diffstat (limited to 'tests/input/src/com/android/tv/testinput')
4 files changed, 9 insertions, 10 deletions
diff --git a/tests/input/src/com/android/tv/testinput/TestInputControl.java b/tests/input/src/com/android/tv/testinput/TestInputControl.java index 5e5ec32a..54845b80 100644 --- a/tests/input/src/com/android/tv/testinput/TestInputControl.java +++ b/tests/input/src/com/android/tv/testinput/TestInputControl.java @@ -21,8 +21,8 @@ import android.net.Uri; import android.os.RemoteException; import android.util.Log; import android.util.LongSparseArray; -import com.android.tv.testing.data.ChannelInfo; -import com.android.tv.testing.data.ChannelUtils; +import com.android.tv.testing.ChannelInfo; +import com.android.tv.testing.ChannelUtils; import com.android.tv.testing.testinput.ChannelState; import com.android.tv.testing.testinput.ChannelStateData; import com.android.tv.testing.testinput.ITestInputControl; diff --git a/tests/input/src/com/android/tv/testinput/TestTvInputService.java b/tests/input/src/com/android/tv/testinput/TestTvInputService.java index 5cefdc72..6e9405d8 100644 --- a/tests/input/src/com/android/tv/testinput/TestTvInputService.java +++ b/tests/input/src/com/android/tv/testinput/TestTvInputService.java @@ -42,13 +42,12 @@ import android.util.Log; import android.view.KeyEvent; import android.view.Surface; import com.android.tv.input.TunerHelper; -import com.android.tv.testing.data.ChannelInfo; +import com.android.tv.testing.ChannelInfo; import com.android.tv.testing.testinput.ChannelState; import java.util.Date; import java.util.concurrent.TimeUnit; /** Simple TV input service which provides test channels. */ -@SuppressWarnings("TryWithResources") // TODO(b/62143348): remove when error prone check fixed public class TestTvInputService extends TvInputService { private static final String TAG = "TestTvInputService"; private static final int REFRESH_DELAY_MS = 1000 / 5; diff --git a/tests/input/src/com/android/tv/testinput/TestTvInputSetupActivity.java b/tests/input/src/com/android/tv/testinput/TestTvInputSetupActivity.java index b315785d..ce18ff81 100644 --- a/tests/input/src/com/android/tv/testinput/TestTvInputSetupActivity.java +++ b/tests/input/src/com/android/tv/testinput/TestTvInputSetupActivity.java @@ -26,11 +26,11 @@ import android.media.tv.TvContract; import android.media.tv.TvInputInfo; import android.os.Bundle; import android.util.Log; -import com.android.tv.testing.constants.Constants; -import com.android.tv.testing.data.ChannelInfo; -import com.android.tv.testing.data.ChannelUtils; -import com.android.tv.testing.data.ProgramInfo; -import com.android.tv.testing.data.ProgramUtils; +import com.android.tv.testing.ChannelInfo; +import com.android.tv.testing.ChannelUtils; +import com.android.tv.testing.Constants; +import com.android.tv.testing.ProgramInfo; +import com.android.tv.testing.ProgramUtils; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/tests/input/src/com/android/tv/testinput/instrument/TestSetupInstrumentation.java b/tests/input/src/com/android/tv/testinput/instrument/TestSetupInstrumentation.java index a4bd45c0..498e25dc 100644 --- a/tests/input/src/com/android/tv/testinput/instrument/TestSetupInstrumentation.java +++ b/tests/input/src/com/android/tv/testinput/instrument/TestSetupInstrumentation.java @@ -21,7 +21,7 @@ import android.app.Instrumentation; import android.os.Bundle; import android.text.TextUtils; import android.util.Log; -import com.android.tv.testing.constants.Constants; +import com.android.tv.testing.Constants; import com.android.tv.testinput.TestTvInputService; import com.android.tv.testinput.TestTvInputSetupActivity; |