Merge redfin/bramble support.
Bug: 171218636
Merged-In: I74e4155eed8692071a54649333becbac06d8a11c
Change-Id: I74a0dbb50ffae239e462194f49eceb468e142fab
diff --git a/src/com/android/tv/SetupPassthroughActivity.java b/src/com/android/tv/SetupPassthroughActivity.java
index 98f9b80..25049f1 100644
--- a/src/com/android/tv/SetupPassthroughActivity.java
+++ b/src/com/android/tv/SetupPassthroughActivity.java
@@ -33,7 +33,7 @@
import com.android.tv.data.ChannelDataManager;
import com.android.tv.data.ChannelDataManager.Listener;
import com.android.tv.data.epg.EpgFetcher;
-import com.android.tv.data.epg.EpgInputAllowList;
+import com.android.tv.data.epg.EpgInputWhiteList;
import com.android.tv.features.TvFeatures;
import com.android.tv.util.SetupUtils;
import com.android.tv.util.TvInputManagerHelper;
@@ -64,7 +64,7 @@
private TvInputInfo mTvInputInfo;
private Intent mActivityAfterCompletion;
private boolean mEpgFetcherDuringScan;
- @Inject EpgInputAllowList mEpgInputAllowList;
+ @Inject EpgInputWhiteList mEpgInputWhiteList;
@Inject TvInputManagerHelper mInputManager;
@Inject SetupUtils mSetupUtils;
@Inject ChannelDataManager mChannelDataManager;
@@ -169,7 +169,7 @@
&& data.getBooleanExtra(EpgContract.EXTRA_USE_CLOUD_EPG, false)) {
if (DEBUG) Log.d(TAG, "extra " + data.getExtras());
String inputId = data.getStringExtra(TvInputInfo.EXTRA_INPUT_ID);
- if (mEpgInputAllowList.isInputAllowed(inputId)) {
+ if (mEpgInputWhiteList.isInputWhiteListed(inputId)) {
mEpgFetcher.fetchImmediately();
}
}
diff --git a/src/com/android/tv/data/epg/EpgFetcherImpl.java b/src/com/android/tv/data/epg/EpgFetcherImpl.java
index b62efbe..27d7f8d 100644
--- a/src/com/android/tv/data/epg/EpgFetcherImpl.java
+++ b/src/com/android/tv/data/epg/EpgFetcherImpl.java
@@ -124,7 +124,7 @@
private final ChannelDataManager mChannelDataManager;
private final EpgReader mEpgReader;
private final PerformanceMonitor mPerformanceMonitor;
- private final EpgInputAllowList mEpgInputAllowList;
+ private final EpgInputWhiteList mEpgInputWhiteList;
private final BackendKnobsFlags mBackendKnobsFlags;
private final HasBuildType.BuildType mBuildType;
private FetchAsyncTask mFetchTask;
@@ -141,7 +141,7 @@
@Inject
public EpgFetcherImpl(
@ApplicationContext Context context,
- EpgInputAllowList epgInputAllowList,
+ EpgInputWhiteList epgInputWhiteList,
ChannelDataManager channelDataManager,
EpgReader epgReader,
PerformanceMonitor performanceMonitor,
@@ -153,7 +153,7 @@
mEpgReader = epgReader;
mPerformanceMonitor = performanceMonitor;
mClock = clock;
- mEpgInputAllowList = epgInputAllowList;
+ mEpgInputWhiteList = epgInputWhiteList;
mBackendKnobsFlags = backendKnobsFlags;
mBuildType = buildType;
}
@@ -516,7 +516,7 @@
return numbers.size();
}
- private boolean isInputAllowed(EpgInput epgInput) {
+ private boolean isInputInWhiteList(EpgInput epgInput) {
if (mBuildType == HasBuildType.BuildType.AOSP) {
return false;
}
@@ -524,7 +524,7 @@
&& epgInput.getInputId()
.equals(
"com.example.partnersupportsampletvinput/.SampleTvInputService"))
- || mEpgInputAllowList.isInputAllowed(epgInput.getInputId());
+ || mEpgInputWhiteList.isInputWhiteListed(epgInput.getInputId());
}
@VisibleForTesting
@@ -561,7 +561,7 @@
if (isCancelled()) {
break;
}
- if (isInputAllowed(epgInput)) {
+ if (isInputInWhiteList(epgInput)) {
// TODO(b/66191312) check timestamp and result code and decide if update
// is needed.
Set<Channel> channels = getExistingChannelsFor(epgInput.getInputId());
diff --git a/src/com/android/tv/data/epg/EpgInputAllowList.java b/src/com/android/tv/data/epg/EpgInputWhiteList.java
similarity index 77%
rename from src/com/android/tv/data/epg/EpgInputAllowList.java
rename to src/com/android/tv/data/epg/EpgInputWhiteList.java
index 7ef52f8..5f4219f 100644
--- a/src/com/android/tv/data/epg/EpgInputAllowList.java
+++ b/src/com/android/tv/data/epg/EpgInputWhiteList.java
@@ -31,10 +31,10 @@
import javax.inject.Inject;
-/** Checks if a package or a input is allowed. */
-public final class EpgInputAllowList {
+/** Checks if a package or a input is white listed. */
+public final class EpgInputWhiteList {
private static final boolean DEBUG = false;
- private static final String TAG = "EpgInputAllowList";
+ private static final String TAG = "EpgInputWhiteList";
private static final ImmutableSet<String> QA_DEV_INPUTS =
ImmutableSet.of(
"com.example.partnersupportsampletvinput/.SampleTvInputService",
@@ -50,33 +50,33 @@
private final CloudEpgFlags mCloudEpgFlags;
@Inject
- public EpgInputAllowList(CloudEpgFlags cloudEpgFlags, LegacyFlags legacyFlags) {
+ public EpgInputWhiteList(CloudEpgFlags cloudEpgFlags, LegacyFlags legacyFlags) {
mCloudEpgFlags = cloudEpgFlags;
mLegacyFlags = legacyFlags;
}
- public boolean isInputAllowed(String inputId) {
- return getAllowedInputs().contains(inputId);
+ public boolean isInputWhiteListed(String inputId) {
+ return getWhiteListedInputs().contains(inputId);
}
- public boolean isPackageAllowed(String packageName) {
- if (DEBUG) Log.d(TAG, "isPackageAllowed " + packageName);
- ImmutableSet<String> allowedInputs = getAllowedInputs();
- for (String allowed : allowedInputs) {
+ public boolean isPackageWhiteListed(String packageName) {
+ if (DEBUG) Log.d(TAG, "isPackageWhiteListed " + packageName);
+ ImmutableSet<String> whiteList = getWhiteListedInputs();
+ for (String good : whiteList) {
try {
- String allowedPackage = getPackageFromInput(allowed);
- if (allowedPackage.equals(packageName)) {
+ String goodPackage = getPackageFromInput(good);
+ if (goodPackage.equals(packageName)) {
return true;
}
} catch (Exception e) {
- if (DEBUG) Log.d(TAG, "Error parsing package name of " + allowed, e);
+ if (DEBUG) Log.d(TAG, "Error parsing package name of " + good, e);
continue;
}
}
return false;
}
- private ImmutableSet<String> getAllowedInputs() {
+ private ImmutableSet<String> getWhiteListedInputs() {
ImmutableSet<String> result =
toInputSet(mCloudEpgFlags.thirdPartyEpgInputs().getElementList());
if (BuildConfig.ENG || mLegacyFlags.enableQaFeatures()) {
@@ -87,7 +87,7 @@
ImmutableSet.<String>builder().addAll(result).addAll(QA_DEV_INPUTS).build();
}
}
- if (DEBUG) Log.d(TAG, "getAllowedInputs " + result);
+ if (DEBUG) Log.d(TAG, "getWhiteListedInputs " + result);
return result;
}
diff --git a/tests/robotests/src/com/android/tv/data/epg/EpgFetcherImplTest.java b/tests/robotests/src/com/android/tv/data/epg/EpgFetcherImplTest.java
index 7b9141f..47b3b21 100644
--- a/tests/robotests/src/com/android/tv/data/epg/EpgFetcherImplTest.java
+++ b/tests/robotests/src/com/android/tv/data/epg/EpgFetcherImplTest.java
@@ -164,7 +164,7 @@
mEpgFetcher =
new EpgFetcherImpl(
RuntimeEnvironment.application,
- new EpgInputAllowList(
+ new EpgInputWhiteList(
mTestApp.flagsModule.cloudEpgFlags,
mTestApp.flagsModule.legacyFlags),
mChannelDataManager,
diff --git a/tests/robotests/src/com/android/tv/data/epg/EpgInputAllowListTest.java b/tests/robotests/src/com/android/tv/data/epg/EpgInputWhiteListTest.java
similarity index 65%
rename from tests/robotests/src/com/android/tv/data/epg/EpgInputAllowListTest.java
rename to tests/robotests/src/com/android/tv/data/epg/EpgInputWhiteListTest.java
index 24899a7..764b017 100644
--- a/tests/robotests/src/com/android/tv/data/epg/EpgInputAllowListTest.java
+++ b/tests/robotests/src/com/android/tv/data/epg/EpgInputWhiteListTest.java
@@ -35,12 +35,12 @@
import java.util.Arrays;
import java.util.List;
-/** Tests for {@link EpgInputAllowList}. */
+/** Tests for {@link EpgInputWhiteList}. */
@RunWith(RobolectricTestRunner.class)
@Config(sdk = ConfigConstants.SDK)
-public class EpgInputAllowListTest {
+public class EpgInputWhiteListTest {
- private EpgInputAllowList mAllowList;
+ private EpgInputWhiteList mWhiteList;
private DefaultCloudEpgFlags mCloudEpgFlags;
private DefaultLegacyFlags mLegacyFlags;
@@ -49,7 +49,7 @@
TvFeatures.CLOUD_EPG_FOR_3RD_PARTY.enableForTest();
mCloudEpgFlags = new DefaultCloudEpgFlags();
mLegacyFlags = DefaultLegacyFlags.DEFAULT;
- mAllowList = new EpgInputAllowList(mCloudEpgFlags, mLegacyFlags);
+ mWhiteList = new EpgInputWhiteList(mCloudEpgFlags, mLegacyFlags);
}
@After
@@ -58,65 +58,65 @@
}
@Test
- public void isInputAllowed_noRemoteConfig() {
- assertThat(mAllowList.isInputAllowed("com.example/.Foo")).isFalse();
+ public void isInputWhiteListed_noRemoteConfig() {
+ assertThat(mWhiteList.isInputWhiteListed("com.example/.Foo")).isFalse();
}
@Test
- public void isInputAllowed_noMatch() {
+ public void isInputWhiteListed_noMatch() {
mCloudEpgFlags.setThirdPartyEpgInput(asStringListParam("com.example/.Bar"));
- assertThat(mAllowList.isInputAllowed("com.example/.Foo")).isFalse();
+ assertThat(mWhiteList.isInputWhiteListed("com.example/.Foo")).isFalse();
}
@Test
- public void isInputAllowed_match() {
+ public void isInputWhiteListed_match() {
mCloudEpgFlags.setThirdPartyEpgInput(asStringListParam("com.example/.Foo"));
- assertThat(mAllowList.isInputAllowed("com.example/.Foo")).isTrue();
+ assertThat(mWhiteList.isInputWhiteListed("com.example/.Foo")).isTrue();
}
@Test
- public void isInputAllowed_matchWithTwo() {
+ public void isInputWhiteListed_matchWithTwo() {
mCloudEpgFlags.setThirdPartyEpgInput(
asStringListParam("com.example/.Foo", "com.example/.Bar"));
- assertThat(mAllowList.isInputAllowed("com.example/.Foo")).isTrue();
+ assertThat(mWhiteList.isInputWhiteListed("com.example/.Foo")).isTrue();
}
@Test
- public void isPackageAllowListed_noRemoteConfig() {
- assertThat(mAllowList.isPackageAllowed("com.example")).isFalse();
+ public void isPackageWhiteListed_noRemoteConfig() {
+ assertThat(mWhiteList.isPackageWhiteListed("com.example")).isFalse();
}
@Test
- public void isPackageAllowed_noMatch() {
+ public void isPackageWhiteListed_noMatch() {
mCloudEpgFlags.setThirdPartyEpgInput(asStringListParam("com.example/.Bar"));
- assertThat(mAllowList.isPackageAllowed("com.other")).isFalse();
+ assertThat(mWhiteList.isPackageWhiteListed("com.other")).isFalse();
}
@Test
- public void isPackageAllowed_match() {
+ public void isPackageWhiteListed_match() {
mCloudEpgFlags.setThirdPartyEpgInput(asStringListParam("com.example/.Foo"));
- assertThat(mAllowList.isPackageAllowed("com.example")).isTrue();
+ assertThat(mWhiteList.isPackageWhiteListed("com.example")).isTrue();
}
@Test
- public void isPackageAllowed_matchWithTwo() {
+ public void isPackageWhiteListed_matchWithTwo() {
mCloudEpgFlags.setThirdPartyEpgInput(
asStringListParam("com.example/.Foo", "com.example/.Bar"));
- assertThat(mAllowList.isPackageAllowed("com.example")).isTrue();
+ assertThat(mWhiteList.isPackageWhiteListed("com.example")).isTrue();
}
@Test
- public void isPackageAllowed_matchBadInput() {
+ public void isPackageWhiteListed_matchBadInput() {
mCloudEpgFlags.setThirdPartyEpgInput(asStringListParam("com.example.Foo"));
- assertThat(mAllowList.isPackageAllowed("com.example")).isFalse();
+ assertThat(mWhiteList.isPackageWhiteListed("com.example")).isFalse();
}
@Test
- public void isPackageAllowed_tunerInput() {
- EpgInputAllowList allowList =
- new EpgInputAllowList(new DefaultCloudEpgFlags(), DefaultLegacyFlags.DEFAULT);
+ public void isPackageWhiteListed_tunerInput() {
+ EpgInputWhiteList whiteList =
+ new EpgInputWhiteList(new DefaultCloudEpgFlags(), DefaultLegacyFlags.DEFAULT);
assertThat(
- allowList.isInputAllowed(
+ whiteList.isInputWhiteListed(
"com.google.android.tv/.tuner.tvinput.TunerTvInputService"))
.isTrue();
}
