Merge "Update language to comply with Android's inclusive language guidance" am: 29e6121335 am: 9160ce3b74
Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1380008
Change-Id: I12118569a29e3722cce4d4db69d2ea671336ee07
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 d384be9..764b017 100644
--- a/tests/robotests/src/com/android/tv/data/epg/EpgInputAllowListTest.java
+++ b/tests/robotests/src/com/android/tv/data/epg/EpgInputWhiteListTest.java
@@ -22,6 +22,7 @@
import com.android.tv.common.flags.impl.DefaultLegacyFlags;
import com.android.tv.features.TvFeatures;
import com.android.tv.testing.constants.ConfigConstants;
+
import com.android.tv.common.flags.proto.TypedFeatures.StringListParam;
import org.junit.After;
@@ -34,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;
@@ -48,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
@@ -57,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();
}
diff --git a/tuner/sampletunertvinput/Android.bp b/tuner/sampletunertvinput/Android.bp
new file mode 100644
index 0000000..9d737c8
--- /dev/null
+++ b/tuner/sampletunertvinput/Android.bp
@@ -0,0 +1,62 @@
+//
+// Copyright (C) 2019 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.
+//
+
+android_app {
+ name: "sampletunertvinput",
+ srcs: ["src/**/*.java"],
+
+ optimize: {
+ enabled: false,
+ },
+
+ platform_apis: true,
+ system_ext_specific: true,
+
+
+ privileged: true,
+ certificate: "platform",
+ // product_specific: true,
+ // sdk_version: "system_current",
+ resource_dirs: ["res"],
+ static_libs: [
+ "android-support-annotations",
+ "android-support-compat",
+ "android-support-core-ui",
+ "android-support-v7-palette",
+ "android-support-v7-recyclerview",
+ "androidx.leanback_leanback",
+ "androidx.tvprovider_tvprovider",
+ "jsr330",
+ "live-tv-tuner-proto",
+ "tv-auto-value-jar",
+ "tv-auto-factory-jar",
+ "tv-common",
+ "tv-error-prone-annotations-jar",
+ "tv-guava-android-jar",
+ "tv-javax-annotations-jar",
+ "tv-lib-dagger",
+ "tv-lib-exoplayer",
+ "tv-lib-exoplayer-v2-core",
+ "tv-lib-dagger-android",
+ "tv-test-common",
+ ],
+ aaptflags: ["-0 .ts"],
+ plugins: [
+ "tv-auto-value",
+ "tv-auto-factory",
+ ],
+ // min_sdk_version: "29",
+}
diff --git a/tuner/sampletunertvinput/AndroidManifest.xml b/tuner/sampletunertvinput/AndroidManifest.xml
new file mode 100644
index 0000000..d282889
--- /dev/null
+++ b/tuner/sampletunertvinput/AndroidManifest.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2019 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ package="com.android.tv.samples.sampletunertvinput"
+ android:sharedUserId="android.uid.system"
+ coreApp="true">
+
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.ACCESS_TV_DESCRAMBLER" />
+ <uses-permission android:name="android.permission.ACCESS_TV_TUNER" />
+ <uses-permission android:name="android.permission.TUNER_RESOURCE_ACCESS" />
+ <uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA" />
+ <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
+ <uses-permission android:name="com.android.tv.permission.RECEIVE_INPUT_EVENT" />
+
+ <uses-feature android:name="android.software.leanback" android:required="true" />
+ <uses-feature android:name="android.software.live_tv" android:required="true" />
+
+ <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="29"
+ tools:overrideLibrary="com.android.tv.testing"/>
+ <application android:label="@string/sample_tuner_tv_input"
+ tools:replace="android:label,icon,theme,appComponentFactory"
+ android:icon="@mipmap/ic_launcher"
+ android:theme="@android:style/Theme.Holo.Light.NoActionBar"
+ android:appComponentFactory="android.support.v4.app.CoreComponentFactory" >
+ <uses-library android:name="com.android.libraries.tv.tvsystem" android:required="false" />
+ <activity android:name=".SampleTunerTvInputSetupActivity" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ </intent-filter>
+ </activity>
+ <service android:name=".SampleTunerTvInputService"
+ android:permission="android.permission.BIND_TV_INPUT"
+ android:label="@string/sample_tuner_tv_input"
+ android:process="com.android.tv.samples.sampletunertvinput">
+ <intent-filter>
+ <action android:name="android.media.tv.TvInputService" />
+ </intent-filter>
+ <meta-data android:name="android.media.tv.input"
+ android:resource="@xml/sampletunertvinputservice" />
+ </service>
+ </application>
+</manifest>
diff --git a/tuner/sampletunertvinput/res/mipmap-hdpi/ic_launcher.png b/tuner/sampletunertvinput/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..454c515
--- /dev/null
+++ b/tuner/sampletunertvinput/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/tuner/sampletunertvinput/res/mipmap-mdpi/ic_launcher.png b/tuner/sampletunertvinput/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..5e53eb5
--- /dev/null
+++ b/tuner/sampletunertvinput/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/tuner/sampletunertvinput/res/mipmap-xhdpi/ic_launcher.png b/tuner/sampletunertvinput/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..898bac4
--- /dev/null
+++ b/tuner/sampletunertvinput/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/tuner/sampletunertvinput/res/mipmap-xxhdpi/ic_launcher.png b/tuner/sampletunertvinput/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..9da2990
--- /dev/null
+++ b/tuner/sampletunertvinput/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/tuner/sampletunertvinput/res/mipmap-xxxhdpi/ic_launcher.png b/tuner/sampletunertvinput/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..ff5c4b1
--- /dev/null
+++ b/tuner/sampletunertvinput/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/tuner/sampletunertvinput/res/values/Strings.xml b/tuner/sampletunertvinput/res/values/Strings.xml
new file mode 100644
index 0000000..f76c8ee
--- /dev/null
+++ b/tuner/sampletunertvinput/res/values/Strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2019 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.
+ -->
+
+<resources>
+ <string name="sample_tuner_tv_input" translatable="false">Sample Tuner TV Input</string>
+</resources>
\ No newline at end of file
diff --git a/tuner/sampletunertvinput/res/xml/sampletunertvinputservice.xml b/tuner/sampletunertvinput/res/xml/sampletunertvinputservice.xml
new file mode 100644
index 0000000..ca39d95
--- /dev/null
+++ b/tuner/sampletunertvinput/res/xml/sampletunertvinputservice.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright (C) 2019 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.
+ -->
+
+<tv-input xmlns:android="http://schemas.android.com/apk/res/android"
+ android:setupActivity="com.android.tv.samples.sampletunertvinput.SampleTunerTvInputSetupActivity" />
diff --git a/tuner/sampletunertvinput/src/com/android/tv/samples/sampletunertvinput/AndroidManifest.xml b/tuner/sampletunertvinput/src/com/android/tv/samples/sampletunertvinput/AndroidManifest.xml
new file mode 100644
index 0000000..8fc96b2
--- /dev/null
+++ b/tuner/sampletunertvinput/src/com/android/tv/samples/sampletunertvinput/AndroidManifest.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2019 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ package="com.android.tv.samples.sampletunertvinput">
+
+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.ACCESS_TV_DESCRAMBLER" />
+ <uses-permission android:name="android.permission.ACCESS_TV_TUNER" />
+ <uses-permission android:name="android.permission.TUNER_RESOURCE_ACCESS" />
+ <uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA" />
+ <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
+ <uses-permission android:name="com.android.tv.permission.RECEIVE_INPUT_EVENT" />
+
+ <uses-feature android:name="android.software.leanback" android:required="true" />
+ <uses-feature android:name="android.software.live_tv" android:required="true" />
+
+ <uses-sdk android:targetSdkVersion="27" android:minSdkVersion="23"/>
+ <application android:label="@string/sample_tuner_tv_input"
+ tools:replace="android:label,icon,theme,appComponentFactory"
+ android:icon="@mipmap/ic_launcher"
+ android:theme="@android:style/Theme.Holo.Light.NoActionBar"
+ android:appComponentFactory="android.support.v4.app.CoreComponentFactory" >
+ <activity android:name=".SampleTunerTvInputSetupActivity" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ </intent-filter>
+ </activity>
+ <service android:name=".SampleTunerTvInputService"
+ android:permission="android.permission.BIND_TV_INPUT"
+ android:label="@string/sample_tuner_tv_input"
+ android:process="com.android.tv.samples.sampletunertvinput">
+ <intent-filter>
+ <action android:name="android.media.tv.TvInputService" />
+ </intent-filter>
+ <meta-data android:name="android.media.tv.input"
+ android:resource="@xml/sampletunertvinputservice" />
+ </service>
+ </application>
+</manifest>
diff --git a/tuner/sampletunertvinput/src/com/android/tv/samples/sampletunertvinput/SampleTunerTvInputService.java b/tuner/sampletunertvinput/src/com/android/tv/samples/sampletunertvinput/SampleTunerTvInputService.java
new file mode 100644
index 0000000..6ac9535
--- /dev/null
+++ b/tuner/sampletunertvinput/src/com/android/tv/samples/sampletunertvinput/SampleTunerTvInputService.java
@@ -0,0 +1,101 @@
+package com.android.tv.samples.sampletunertvinput;
+
+import android.content.Context;
+import android.media.tv.tuner.frontend.AtscFrontendSettings;
+import android.media.tv.tuner.frontend.FrontendSettings;
+import android.media.tv.tuner.Tuner;
+import android.media.tv.TvInputService;
+import android.net.Uri;
+import android.util.Log;
+import android.view.Surface;
+
+
+/** SampleTunerTvInputService */
+public class SampleTunerTvInputService extends TvInputService {
+ private static final String TAG = "SampleTunerTvInput";
+ private static final boolean DEBUG = true;
+
+ public static final String INPUT_ID =
+ "com.android.tv.samples.sampletunertvinput/.SampleTunerTvInputService";
+ private String mSessionId;
+
+ @Override
+ public TvInputSessionImpl onCreateSession(String inputId, String sessionId) {
+ TvInputSessionImpl session = new TvInputSessionImpl(this);
+ if (DEBUG) {
+ Log.d(TAG, "onCreateSession(inputId=" + inputId + ", sessionId=" + sessionId + ")");
+ }
+ mSessionId = sessionId;
+ return session;
+ }
+
+ @Override
+ public TvInputSessionImpl onCreateSession(String inputId) {
+ return new TvInputSessionImpl(this);
+ }
+
+ class TvInputSessionImpl extends Session {
+
+ private Surface surface;
+ private final Context mContext;
+ Tuner tuner;
+
+
+ public TvInputSessionImpl(Context context) {
+ super(context);
+ mContext = context;
+ }
+
+ @Override
+ public void onRelease() {
+ if (DEBUG) {
+ Log.d(TAG, "onRelease");
+ }
+ }
+
+ @Override
+ public boolean onSetSurface(Surface surface) {
+ if (DEBUG) {
+ Log.d(TAG, "onSetSurface");
+ }
+ this.surface = surface;
+ return true;
+ }
+
+ @Override
+ public void onSetStreamVolume(float v) {
+ if (DEBUG) {
+ Log.d(TAG, "onSetStreamVolume " + v);
+ }
+ }
+
+ @Override
+ public boolean onTune(Uri uri) {
+ if (DEBUG) {
+ Log.d(TAG, "onTune " + uri);
+ }
+ tuner = new Tuner(mContext, mSessionId,
+ TvInputService.PRIORITY_HINT_USE_CASE_TYPE_LIVE);
+
+ int feCount = tuner.getFrontendIds().size();
+ if (feCount <= 0) return false;
+
+ AtscFrontendSettings settings =
+ AtscFrontendSettings
+ .builder()
+ .setFrequency(2000)
+ .setModulation(AtscFrontendSettings.MODULATION_AUTO)
+ .build();
+ tuner.tune(settings);
+
+ return true;
+ }
+
+ @Override
+ public void onSetCaptionEnabled(boolean b) {
+ if (DEBUG) {
+ Log.d(TAG, "onSetCaptionEnabled " + b);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/tuner/sampletunertvinput/src/com/android/tv/samples/sampletunertvinput/SampleTunerTvInputSetupActivity.java b/tuner/sampletunertvinput/src/com/android/tv/samples/sampletunertvinput/SampleTunerTvInputSetupActivity.java
new file mode 100644
index 0000000..b932b60
--- /dev/null
+++ b/tuner/sampletunertvinput/src/com/android/tv/samples/sampletunertvinput/SampleTunerTvInputSetupActivity.java
@@ -0,0 +1,50 @@
+package com.android.tv.samples.sampletunertvinput;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.media.tv.TvInputInfo;
+import android.os.Bundle;
+import com.android.tv.testing.data.ChannelInfo;
+import com.android.tv.testing.data.ChannelUtils;
+import com.android.tv.testing.data.ProgramInfo;
+import java.util.Collections;
+
+/** Setup activity for SampleTunerTvInput */
+public class SampleTunerTvInputSetupActivity extends Activity {
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ ChannelInfo channel =
+ new ChannelInfo.Builder()
+ .setNumber("1-1")
+ .setName("Sample Channel")
+ .setLogoUrl(
+ ChannelInfo.getUriStringForChannelLogo(this, 100))
+ .setOriginalNetworkId(1)
+ .setVideoWidth(640)
+ .setVideoHeight(480)
+ .setAudioChannel(2)
+ .setAudioLanguageCount(1)
+ .setHasClosedCaption(false)
+ .setProgram(
+ new ProgramInfo(
+ "Sample Program",
+ "",
+ 0,
+ 0,
+ ProgramInfo.GEN_POSTER,
+ "Sample description",
+ ProgramInfo.GEN_DURATION,
+ null,
+ ProgramInfo.GEN_GENRE,
+ null))
+ .build();
+
+ Intent intent = getIntent();
+ String inputId = intent.getStringExtra(TvInputInfo.EXTRA_INPUT_ID);
+ ChannelUtils.updateChannels(this, inputId, Collections.singletonList(channel));
+ setResult(Activity.RESULT_OK);
+ finish();
+ }
+
+}
