diff options
Diffstat (limited to 'tuner/SampleDvbTuner/src')
5 files changed, 30 insertions, 47 deletions
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 8732b0d8..dc042286 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 @@ -27,8 +27,6 @@ <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" /> @@ -38,7 +36,7 @@ <uses-feature android:name="android.software.leanback" android:required="true" /> <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="28" android:minSdkVersion="23"/> + <uses-sdk android:targetSdkVersion="27" android:minSdkVersion="23"/> <application android:name=".app.SampleDvbTuner" android:icon="@mipmap/ic_launcher" diff --git a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java index 5c9e8420..568e3c98 100644 --- a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java +++ b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTuner.java @@ -18,18 +18,16 @@ package com.android.tv.tuner.sample.dvb.app; import android.content.ComponentName; import android.media.tv.TvContract; - import com.android.tv.common.BaseApplication; -import com.android.tv.common.dagger.ApplicationModule; import com.android.tv.common.singletons.HasSingletons; import com.android.tv.tuner.modules.TunerSingletonsModule; import com.android.tv.tuner.sample.dvb.singletons.SampleDvbSingletons; import com.android.tv.tuner.sample.dvb.tvinput.SampleDvbTunerTvInputService; - +import com.android.tv.tuner.tvinput.factory.TunerSessionFactory; +import com.android.tv.tuner.tvinput.factory.TunerSessionFactoryImpl; import dagger.android.AndroidInjector; - import com.android.tv.common.flags.CloudEpgFlags; - +import com.android.tv.common.flags.ConcurrentDvrPlaybackFlags; import javax.inject.Inject; /** The top level application for Sample DVB Tuner. */ @@ -38,6 +36,8 @@ public class SampleDvbTuner extends BaseApplication private String mEmbeddedInputId; @Inject CloudEpgFlags mCloudEpgFlags; + @Inject ConcurrentDvrPlaybackFlags mConcurrentDvrPlaybackFlags; + @Inject TunerSessionFactoryImpl mTunerSessionFactory; @Override public void onCreate() { @@ -47,7 +47,7 @@ public class SampleDvbTuner extends BaseApplication @Override protected AndroidInjector<SampleDvbTuner> applicationInjector() { return DaggerSampleDvbTunerComponent.builder() - .applicationModule(new ApplicationModule(this)) + .sampleDvbTunerModule(new SampleDvbTunerModule(this)) .tunerSingletonsModule(new TunerSingletonsModule(this)) .build(); } @@ -73,7 +73,16 @@ public class SampleDvbTuner extends BaseApplication } @Override + public ConcurrentDvrPlaybackFlags getConcurrentDvrPlaybackFlags() { + return mConcurrentDvrPlaybackFlags; + } + + @Override public SampleDvbSingletons singletons() { return this; } + + public TunerSessionFactory getTunerSessionFactory() { + return mTunerSessionFactory; + } } diff --git a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTunerModule.java b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTunerModule.java index aaaa1011..4da3ca9d 100644 --- a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTunerModule.java +++ b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/app/SampleDvbTunerModule.java @@ -15,30 +15,38 @@ */ package com.android.tv.tuner.sample.dvb.app; -import com.android.tv.common.dagger.ApplicationModule; import com.android.tv.common.flags.impl.DefaultFlagsModule; import com.android.tv.tuner.api.TunerFactory; -import com.android.tv.tuner.dvb.DvbTunerHalFactory; +import com.android.tv.tuner.builtin.BuiltInTunerHalFactory; import com.android.tv.tuner.modules.TunerModule; import com.android.tv.tuner.sample.dvb.setup.SampleDvbTunerSetupActivity; import com.android.tv.tuner.sample.dvb.tvinput.SampleDvbTunerTvInputService; - +import com.android.tv.tuner.tvinput.factory.TunerSessionFactory; import dagger.Module; import dagger.Provides; /** Dagger module for {@link SampleDvbTuner}. */ @Module( includes = { - ApplicationModule.class, DefaultFlagsModule.class, SampleDvbTunerTvInputService.Module.class, SampleDvbTunerSetupActivity.Module.class, TunerModule.class, }) class SampleDvbTunerModule { + private final SampleDvbTuner mSampleDvbTuner; + + SampleDvbTunerModule(SampleDvbTuner sampleDvbTuner) { + mSampleDvbTuner = sampleDvbTuner; + } + + @Provides + public TunerSessionFactory providesTunerSessionFactory() { + return mSampleDvbTuner.getTunerSessionFactory(); + } @Provides TunerFactory providesTunerFactory() { - return DvbTunerHalFactory.INSTANCE; + return BuiltInTunerHalFactory.INSTANCE; } } diff --git a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/setup/SampleDvbTunerSetupActivity.java b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/setup/SampleDvbTunerSetupActivity.java index e2b5063c..f9ef29c4 100644 --- a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/setup/SampleDvbTunerSetupActivity.java +++ b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/setup/SampleDvbTunerSetupActivity.java @@ -36,7 +36,6 @@ import com.android.tv.common.ui.setup.SetupFragment; import com.android.tv.common.ui.setup.SetupMultiPaneFragment; import com.android.tv.common.util.PostalCodeUtils; import com.android.tv.tuner.sample.dvb.R; -import com.android.tv.tuner.sample.dvb.util.SampleDvbConstants; import com.android.tv.tuner.setup.BaseTunerSetupActivity; import com.android.tv.tuner.setup.ConnectionTypeFragment; import com.android.tv.tuner.setup.LineupFragment; @@ -56,7 +55,7 @@ import dagger.android.ContributesAndroidInjector; import java.util.ArrayList; import java.util.List; -/** An activity that serves Sample DVB tuner setup process. */ +/** An activity that serves Live TV tuner setup process. */ public class SampleDvbTunerSetupActivity extends BaseTunerSetupActivity { private static final String TAG = "SampleDvbTunerSetupActivity"; private static final boolean DEBUG = false; @@ -79,10 +78,6 @@ public class SampleDvbTunerSetupActivity extends BaseTunerSetupActivity { private final Runnable cancelFetchLineupTaskRunnable = this::cancelFetchLineup; private String embeddedInputId; - public SampleDvbTunerSetupActivity() { - super(SampleDvbConstants.TUNER_INPUT_ID); - } - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -198,7 +193,6 @@ public class SampleDvbTunerSetupActivity extends BaseTunerSetupActivity { case ScanFragment.ACTION_CATEGORY: switch (actionId) { case ScanFragment.ACTION_CANCEL: - clearTunerHal(); getFragmentManager().popBackStack(); return true; case ScanFragment.ACTION_FINISH: diff --git a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/util/SampleDvbConstants.java b/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/util/SampleDvbConstants.java deleted file mode 100644 index f7b34cef..00000000 --- a/tuner/SampleDvbTuner/src/com/android/tv/tuner/sample/dvb/util/SampleDvbConstants.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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. - */ -package com.android.tv.tuner.sample.dvb.util; - -/** Static constants for Sample DVB Tuner */ -public final class SampleDvbConstants { - - /** The Input ID for the embedded tuner in Sample DVB Tuner */ - public static final String TUNER_INPUT_ID = - "com.android.tv.tuner.sample.dvb/.tvinput.SampleDvbTunerTvInputService"; - - private SampleDvbConstants() {} -} |