Keep the sample tuner manifests in sync
PiperOrigin-RevId: 228420619
Change-Id: Ib7496c06d03ee3fd95cc2a36610bc25d954075ae
diff --git a/tuner/SampleDvbTuner/AndroidManifest.xml b/tuner/SampleDvbTuner/AndroidManifest.xml
index 5a73d4c..5ad927e 100755
--- a/tuner/SampleDvbTuner/AndroidManifest.xml
+++ b/tuner/SampleDvbTuner/AndroidManifest.xml
@@ -23,15 +23,12 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.READ_CONTENT_RATING_SYSTEMS" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_TV_LISTINGS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA" />
<uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA" />
- <!--Permission to modify Recorded Program-->
- <uses-permission android:name="com.android.providers.tv.permission.ACCESS_ALL_EPG_DATA" />
<!-- Permissions/feature for USB tuner -->
<uses-permission android:name="android.permission.DVB_DEVICE" />
@@ -53,12 +50,10 @@
<application
android:name="com.android.tv.tuner.sample.dvb.app.SampleDvbTuner"
+ android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
android:icon="@mipmap/ic_launcher"
android:label="@string/sample_dvb_tuner_app_name" >
- <activity
- android:name="com.google.android.gms.common.api.GoogleApiActivity"
- android:exported="false"
- android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+
<activity
android:name="com.android.tv.tuner.sample.dvb.setup.SampleDvbTunerSetupActivity"
@@ -76,7 +71,7 @@
android:name="com.android.tv.tuner.sample.dvb.tvinput.SampleDvbTunerTvInputService"
android:label="@string/sample_dvb_tuner_app_name"
android:permission="android.permission.BIND_TV_INPUT"
- android:process="com.google.android.tv.tuner.sample.dvb.tvinput" >
+ android:process="com.android.tv.tuner.sample.dvb.tvinput" >
<intent-filter>
<action android:name="android.media.tv.TvInputService" />
</intent-filter>
diff --git a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/AndroidManifest.xml b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/AndroidManifest.xml
index 47c2dc0..dc04228 100644
--- a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/AndroidManifest.xml
+++ b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/AndroidManifest.xml
@@ -37,5 +37,9 @@
<uses-feature android:name="android.software.live_tv" android:required="true" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<uses-sdk android:targetSdkVersion="27" android:minSdkVersion="23"/>
- <application />
+ <application
+ android:name=".app.SampleDvbTuner"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/sample_dvb_tuner_app_name"
+ />
</manifest>
diff --git a/tuner/SampleNetworkTuner/AndroidManifest.xml b/tuner/SampleNetworkTuner/AndroidManifest.xml
index 5e099d2..0ec9afc 100755
--- a/tuner/SampleNetworkTuner/AndroidManifest.xml
+++ b/tuner/SampleNetworkTuner/AndroidManifest.xml
@@ -23,7 +23,6 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.READ_CONTENT_RATING_SYSTEMS" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_TV_LISTINGS" />
@@ -51,12 +50,10 @@
<application
android:name="com.android.tv.tuner.sample.network.app.SampleNetworkTuner"
+ android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
android:icon="@mipmap/ic_launcher"
android:label="@string/sample_network_tuner_app_name" >
- <activity
- android:name="com.google.android.gms.common.api.GoogleApiActivity"
- android:exported="false"
- android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+
<activity
android:name="com.android.tv.tuner.sample.network.setup.SampleNetworkTunerSetupActivity"
@@ -74,7 +71,7 @@
android:name="com.android.tv.tuner.sample.network.tvinput.SampleNetworkTunerTvInputService"
android:label="@string/sample_network_tuner_app_name"
android:permission="android.permission.BIND_TV_INPUT"
- android:process="com.google.android.tv.tuner.sample.network.tvinput" >
+ android:process="com.android.tv.tuner.sample.network.tvinput" >
<intent-filter>
<action android:name="android.media.tv.TvInputService" />
</intent-filter>
diff --git a/tuner/SampleNetworkTuner/src/com/android/tv/tuner/sample/network/AndroidManifest.xml b/tuner/SampleNetworkTuner/src/com/android/tv/tuner/sample/network/AndroidManifest.xml
index a678097..dddd8a4 100644
--- a/tuner/SampleNetworkTuner/src/com/android/tv/tuner/sample/network/AndroidManifest.xml
+++ b/tuner/SampleNetworkTuner/src/com/android/tv/tuner/sample/network/AndroidManifest.xml
@@ -37,5 +37,9 @@
<uses-feature android:name="android.software.live_tv" android:required="true" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<uses-sdk android:targetSdkVersion="27" android:minSdkVersion="23"/>
- <application />
+ <application
+ android:name=".app.SampleNetworkTuner"
+ android:icon="@mipmap/ic_launcher"
+ android:label="@string/sample_network_tuner_app_name"
+ />
</manifest>
