TV: Apply API renamings
Bug: 17389538
Change-Id: Idaa1e5f0477901798f22569fa454de9b9296885e
diff --git a/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java b/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
index 53b53b4..46ed5cc 100644
--- a/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
@@ -20,19 +20,16 @@
import android.app.Instrumentation;
import android.content.Context;
import android.cts.util.PollingCheck;
-import android.test.ActivityInstrumentationTestCase2;
import android.media.tv.TvContract;
import android.media.tv.TvInputInfo;
import android.media.tv.TvInputManager;
import android.media.tv.TvView;
-import android.media.tv.cts.Utils;
-import android.net.Uri;
+import android.test.ActivityInstrumentationTestCase2;
import android.util.ArrayMap;
import com.android.cts.tv.R;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Random;
@@ -42,7 +39,6 @@
*/
public class BundledTvInputServiceTest
extends ActivityInstrumentationTestCase2<TvViewStubActivity> {
- private static final String TAG = BundledTvInputServiceTest.class.getSimpleName();
/** The maximum time to wait for an operation. */
private static final long TIME_OUT = 15000L;
@@ -50,12 +46,12 @@
private Activity mActivity;
private Instrumentation mInstrumentation;
private TvInputManager mManager;
- private List<TvInputInfo> mPassthroughInputList = new ArrayList<>();
- private final MockListener mListener = new MockListener();
+ private final List<TvInputInfo> mPassthroughInputList = new ArrayList<>();
+ private final MockCallback mCallback = new MockCallback();
- private static class MockListener extends TvView.TvInputListener {
+ private static class MockCallback extends TvView.TvInputCallback {
private final Map<String, Integer> mVideoUnavailableReasonMap = new ArrayMap<>();
- private Object mLock = new Object();
+ private final Object mLock = new Object();
private final int VIDEO_AVAILABLE = -1;
public Integer getVideoUnavailableReason(String inputId) {
@@ -109,7 +105,7 @@
mPassthroughInputList.add(info);
}
}
- mTvView.setTvInputListener(mListener);
+ mTvView.setCallback(mCallback);
}
@Override
@@ -138,7 +134,7 @@
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- Integer reason = mListener.getVideoUnavailableReason(info.getId());
+ Integer reason = mCallback.getVideoUnavailableReason(info.getId());
return reason != null
&& reason != TvInputManager.VIDEO_UNAVAILABLE_REASON_TUNING
&& reason != TvInputManager.VIDEO_UNAVAILABLE_REASON_BUFFERING;
@@ -162,7 +158,7 @@
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- Integer reason = mListener.getVideoUnavailableReason(info.getId());
+ Integer reason = mCallback.getVideoUnavailableReason(info.getId());
return reason != null
&& reason != TvInputManager.VIDEO_UNAVAILABLE_REASON_TUNING
&& reason != TvInputManager.VIDEO_UNAVAILABLE_REASON_BUFFERING;
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvContractTest.java b/tests/tests/tv/src/android/media/tv/cts/TvContractTest.java
index 6d31a80..6d9fe74 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvContractTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvContractTest.java
@@ -27,14 +27,12 @@
import android.media.tv.TvContentRating;
import android.media.tv.TvContract;
import android.net.Uri;
-import android.os.RemoteException;
import android.test.AndroidTestCase;
import com.android.cts.tv.R;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Arrays;
/**
* Test for {@link android.media.tv.TvContract}.
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvInputInfoTest.java b/tests/tests/tv/src/android/media/tv/cts/TvInputInfoTest.java
index 335e7dc..440ecb2 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvInputInfoTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvInputInfoTest.java
@@ -52,7 +52,7 @@
if (!Utils.hasTvInputFramework(getContext())) {
return;
}
- Intent intent = mStubInfo.getIntentForSettingsActivity();
+ Intent intent = mStubInfo.createSettingsIntent();
assertEquals(intent.getComponent(), new ComponentName(getContext(),
TvInputSettingsActivityStub.class));
@@ -64,7 +64,7 @@
if (!Utils.hasTvInputFramework(getContext())) {
return;
}
- Intent intent = mStubInfo.getIntentForSetupActivity();
+ Intent intent = mStubInfo.createSetupIntent();
assertEquals(intent.getComponent(), new ComponentName(getContext(),
TvInputSetupActivityStub.class));
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java b/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
index 3b486f6..790adf9 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
@@ -16,15 +16,10 @@
package android.media.tv.cts;
-import android.content.ComponentName;
import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.test.AndroidTestCase;
import android.media.tv.TvInputInfo;
import android.media.tv.TvInputManager;
-import android.media.tv.TvInputService;
-import android.media.tv.cts.Utils;
+import android.test.AndroidTestCase;
import java.util.List;
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java b/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java
index 202319f..6e30421 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java
@@ -19,32 +19,24 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.content.pm.PackageManager;
import android.cts.util.PollingCheck;
-import android.database.Cursor;
-import android.test.ActivityInstrumentationTestCase2;
import android.media.tv.TvContentRating;
import android.media.tv.TvContract;
import android.media.tv.TvInputInfo;
import android.media.tv.TvInputManager;
-import android.media.tv.TvInputService;
import android.media.tv.TvTrackInfo;
import android.media.tv.TvView;
-import android.media.tv.TvInputService.Session;
import android.media.tv.cts.TvInputServiceTest.CountingTvInputService.CountingSession;
-import android.media.tv.cts.Utils;
import android.net.Uri;
-import android.util.ArrayMap;
-import android.util.SparseIntArray;
+import android.test.ActivityInstrumentationTestCase2;
import android.view.KeyEvent;
-import android.view.MotionEvent;
import android.view.Surface;
import com.android.cts.tv.R;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
+
/**
* Test {@link android.media.tv.TvInputService}.
@@ -58,9 +50,9 @@
private Instrumentation mInstrumentation;
private TvInputManager mManager;
private TvInputInfo mStubInfo;
- private final StubListener mListener = new StubListener();
+ private final StubCallback mCallback = new StubCallback();
- private static class StubListener extends TvView.TvInputListener {
+ private static class StubCallback extends TvView.TvInputCallback {
private int mChannelRetunedCount;
private int mVideoAvailableCount;
private int mVideoUnavailableCount;
@@ -126,7 +118,7 @@
}
}
assertNotNull(mStubInfo);
- mTvView.setTvInputListener(mListener);
+ mTvView.setCallback(mCallback);
CountingTvInputService.sSession = null;
}
@@ -171,7 +163,7 @@
}
public void verifyCommandSetStreamVolume() {
- mTvView.setStreamVolume(1.0f);;
+ mTvView.setStreamVolume(1.0f);
mInstrumentation.waitForIdleSync();
new PollingCheck(TIME_OUT) {
@Override
@@ -226,7 +218,7 @@
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- return mListener.mChannelRetunedCount > 0;
+ return mCallback.mChannelRetunedCount > 0;
}
}.run();
}
@@ -238,7 +230,7 @@
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- return mListener.mVideoAvailableCount > 0;
+ return mCallback.mVideoAvailableCount > 0;
}
}.run();
}
@@ -250,7 +242,7 @@
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- return mListener.mVideoUnavailableCount > 0;
+ return mCallback.mVideoUnavailableCount > 0;
}
}.run();
}
@@ -262,7 +254,7 @@
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- return mListener.mTrackChangedCount > 0;
+ return mCallback.mTrackChangedCount > 0;
}
}.run();
}
@@ -274,7 +266,7 @@
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- return mListener.mTrackSelectedCount > 0;
+ return mCallback.mTrackSelectedCount > 0;
}
}.run();
}
@@ -286,7 +278,7 @@
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- return mListener.mContentAllowedCount > 0;
+ return mCallback.mContentAllowedCount > 0;
}
}.run();
}
@@ -300,7 +292,7 @@
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- return mListener.mContentBlockedCount > 0;
+ return mCallback.mContentBlockedCount > 0;
}
}.run();
}
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java b/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java
index 960aef73..9dc3bb0 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java
@@ -21,15 +21,14 @@
import android.content.Context;
import android.cts.util.PollingCheck;
import android.database.Cursor;
-import android.test.ActivityInstrumentationTestCase2;
-import android.media.tv.TvContentRating;
import android.media.tv.TvContract;
import android.media.tv.TvInputInfo;
import android.media.tv.TvInputManager;
import android.media.tv.TvTrackInfo;
import android.media.tv.TvView;
-import android.media.tv.cts.Utils;
+import android.media.tv.TvView.TvInputCallback;
import android.net.Uri;
+import android.test.ActivityInstrumentationTestCase2;
import android.util.ArrayMap;
import android.util.SparseIntArray;
import android.view.InputEvent;
@@ -54,13 +53,13 @@
private Instrumentation mInstrumentation;
private TvInputManager mManager;
private TvInputInfo mStubInfo;
- private final MockListener mListener = new MockListener();
+ private final MockCallback mCallback = new MockCallback();
- private static class MockListener extends TvView.TvInputListener {
+ private static class MockCallback extends TvInputCallback {
private final Map<String, Boolean> mVideoAvailableMap = new ArrayMap<>();
private final Map<String, SparseIntArray> mSelectedTrackGenerationMap = new ArrayMap<>();
private final Map<String, Integer> mTracksGenerationMap = new ArrayMap<>();
- private Object mLock = new Object();
+ private final Object mLock = new Object();
public boolean isVideoAvailable(String inputId) {
synchronized (mLock) {
@@ -80,13 +79,6 @@
}
}
- public int getTrackGeneration(String inputId) {
- synchronized (mLock) {
- Integer tracksGeneration = mTracksGenerationMap.get(inputId);
- return tracksGeneration == null ? 0 : tracksGeneration.intValue();
- }
- }
-
@Override
public void onVideoAvailable(String inputId) {
synchronized (mLock) {
@@ -159,7 +151,7 @@
}
}
assertNotNull(mStubInfo);
- mTvView.setTvInputListener(mListener);
+ mTvView.setCallback(mCallback);
}
@Override
@@ -203,7 +195,7 @@
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- return mListener.isVideoAvailable(mStubInfo.getId());
+ return mCallback.isVideoAvailable(mStubInfo.getId());
}
}.run();
@@ -223,13 +215,13 @@
private void selectTrackAndVerify(final int type, final TvTrackInfo track,
List<TvTrackInfo> tracks) {
- final int previousGeneration = mListener.getSelectedTrackGeneration(
+ final int previousGeneration = mCallback.getSelectedTrackGeneration(
mStubInfo.getId(), type);
mTvView.selectTrack(type, track == null ? null : track.getId());
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- return mListener.getSelectedTrackGeneration(
+ return mCallback.getSelectedTrackGeneration(
mStubInfo.getId(), type) > previousGeneration;
}
}.run();
@@ -304,7 +296,6 @@
final int[] types = { TvTrackInfo.TYPE_AUDIO, TvTrackInfo.TYPE_VIDEO,
TvTrackInfo.TYPE_SUBTITLE };
for (int type : types) {
- final int typeF = type;
for (TvTrackInfo track : mTvView.getTracks(type)) {
selectTrackAndVerify(type, track, tracks);
}
@@ -355,7 +346,7 @@
new PollingCheck(TIME_OUT) {
@Override
protected boolean check() {
- return mListener.isVideoAvailable(mStubInfo.getId());
+ return mCallback.isVideoAvailable(mStubInfo.getId());
}
}.run();
}
