From 4a5144ac8c51c4d89d1359e13e37fcd7f928ed9a Mon Sep 17 00:00:00 2001 From: Live Channels Team Date: Thu, 11 Jan 2018 20:42:01 -0800 Subject: Project import generated by Copybara. PiperOrigin-RevId: 181700159 Change-Id: I7bae213f26b690c0d76189c08abd85d7f7b304a3 --- src/com/android/tv/receiver/AudioCapabilitiesReceiver.java | 11 +++++------ src/com/android/tv/receiver/BootCompletedReceiver.java | 13 +++++++------ src/com/android/tv/receiver/GlobalKeyReceiver.java | 6 ++++-- src/com/android/tv/receiver/PackageIntentsReceiver.java | 9 +++++---- 4 files changed, 21 insertions(+), 18 deletions(-) (limited to 'src/com/android/tv/receiver') diff --git a/src/com/android/tv/receiver/AudioCapabilitiesReceiver.java b/src/com/android/tv/receiver/AudioCapabilitiesReceiver.java index 90e087f0..3fb66245 100644 --- a/src/com/android/tv/receiver/AudioCapabilitiesReceiver.java +++ b/src/com/android/tv/receiver/AudioCapabilitiesReceiver.java @@ -24,11 +24,10 @@ import android.media.AudioFormat; import android.media.AudioManager; import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import com.android.tv.ApplicationSingletons; -import com.android.tv.TvApplication; +import com.android.tv.TvSingletons; import com.android.tv.analytics.Analytics; import com.android.tv.analytics.Tracker; -import com.android.tv.common.SharedPreferencesUtils; +import com.android.tv.common.util.SharedPreferencesUtils; /** * Creates HDMI plug broadcast receiver, and reports AC3 passthrough capabilities to Google @@ -61,9 +60,9 @@ public final class AudioCapabilitiesReceiver { public AudioCapabilitiesReceiver( @NonNull Context context, @Nullable OnAc3PassthroughCapabilityChangeListener listener) { mContext = context; - ApplicationSingletons appSingletons = TvApplication.getSingletons(context); - mAnalytics = appSingletons.getAnalytics(); - mTracker = appSingletons.getTracker(); + TvSingletons tvSingletons = TvSingletons.getSingletons(context); + mAnalytics = tvSingletons.getAnalytics(); + mTracker = tvSingletons.getTracker(); mListener = listener; } diff --git a/src/com/android/tv/receiver/BootCompletedReceiver.java b/src/com/android/tv/receiver/BootCompletedReceiver.java index b3ecb8e6..d8528bb5 100644 --- a/src/com/android/tv/receiver/BootCompletedReceiver.java +++ b/src/com/android/tv/receiver/BootCompletedReceiver.java @@ -23,9 +23,10 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Build; import android.util.Log; -import com.android.tv.Features; +import com.android.tv.Starter; import com.android.tv.TvActivity; -import com.android.tv.TvApplication; +import com.android.tv.TvFeatures; +import com.android.tv.TvSingletons; import com.android.tv.dvr.recorder.DvrRecordingService; import com.android.tv.dvr.recorder.RecordingScheduler; import com.android.tv.recommendation.ChannelPreviewUpdater; @@ -51,12 +52,12 @@ public class BootCompletedReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if (!TvApplication.getSingletons(context).getTvInputManagerHelper().hasTvInputManager()) { + if (!TvSingletons.getSingletons(context).getTvInputManagerHelper().hasTvInputManager()) { Log.wtf(TAG, "Stopping because device does not have a TvInputManager"); return; } if (DEBUG) Log.d(TAG, "boot completed " + intent); - TvApplication.setCurrentRunningProcess(context, true); + Starter.start(context); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { ChannelPreviewUpdater.getInstance(context).updatePreviewDataForChannelsImmediately(); @@ -69,7 +70,7 @@ public class BootCompletedReceiver extends BroadcastReceiver { // Grant permission to already set up packages after the system has finished booting. SetupUtils.grantEpgPermissionToSetUpPackages(context); - if (Features.UNHIDE.isEnabled(context)) { + if (TvFeatures.UNHIDE.isEnabled(context)) { if (OnboardingUtils.isFirstBoot(context)) { // Enable the application if this is the first "unhide" feature is enabled just in // case when the app has been disabled before. @@ -84,7 +85,7 @@ public class BootCompletedReceiver extends BroadcastReceiver { } } - RecordingScheduler scheduler = TvApplication.getSingletons(context).getRecordingScheduler(); + RecordingScheduler scheduler = TvSingletons.getSingletons(context).getRecordingScheduler(); if (scheduler != null) { scheduler.updateAndStartServiceIfNeeded(); } diff --git a/src/com/android/tv/receiver/GlobalKeyReceiver.java b/src/com/android/tv/receiver/GlobalKeyReceiver.java index 7c4117d4..0133d8ee 100644 --- a/src/com/android/tv/receiver/GlobalKeyReceiver.java +++ b/src/com/android/tv/receiver/GlobalKeyReceiver.java @@ -23,7 +23,9 @@ import android.os.AsyncTask; import android.provider.Settings; import android.util.Log; import android.view.KeyEvent; +import com.android.tv.Starter; import com.android.tv.TvApplication; +import com.android.tv.TvSingletons; /** Handles global keys. */ public class GlobalKeyReceiver extends BroadcastReceiver { @@ -39,11 +41,11 @@ public class GlobalKeyReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if (!TvApplication.getSingletons(context).getTvInputManagerHelper().hasTvInputManager()) { + if (!TvSingletons.getSingletons(context).getTvInputManagerHelper().hasTvInputManager()) { Log.wtf(TAG, "Stopping because device does not have a TvInputManager"); return; } - TvApplication.setCurrentRunningProcess(context, true); + Starter.start(context); Context appContext = context.getApplicationContext(); if (DEBUG) Log.d(TAG, "onReceive: " + intent); if (sUserSetupComplete) { diff --git a/src/com/android/tv/receiver/PackageIntentsReceiver.java b/src/com/android/tv/receiver/PackageIntentsReceiver.java index bd26c7b3..7ff67b50 100644 --- a/src/com/android/tv/receiver/PackageIntentsReceiver.java +++ b/src/com/android/tv/receiver/PackageIntentsReceiver.java @@ -21,7 +21,8 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.util.Log; -import com.android.tv.TvApplication; +import com.android.tv.Starter; +import com.android.tv.TvSingletons; import com.android.tv.util.Partner; /** A class for handling the broadcast intents from PackageManager. */ @@ -30,12 +31,12 @@ public class PackageIntentsReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if (!TvApplication.getSingletons(context).getTvInputManagerHelper().hasTvInputManager()) { + if (!TvSingletons.getSingletons(context).getTvInputManagerHelper().hasTvInputManager()) { Log.wtf(TAG, "Stopping because device does not have a TvInputManager"); return; } - TvApplication.setCurrentRunningProcess(context, true); - ((TvApplication) context.getApplicationContext()).handleInputCountChanged(); + Starter.start(context); + ((TvSingletons) context.getApplicationContext()).handleInputCountChanged(); Uri uri = intent.getData(); final String packageName = (uri != null ? uri.getSchemeSpecificPart() : null); -- cgit v1.2.3