diff options
| author | Live Channels Team <no-reply@google.com> | 2018-05-16 12:57:34 -0700 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2018-05-18 10:28:13 -0700 |
| commit | 485b7396c529b2b6c57e4f0a0dc3f5e62f6ff141 (patch) | |
| tree | 9202e52645278712420395e905a07eb238218072 | |
| parent | cbe6445512e41b601c3228f06f5ce0ec7ed40e4f (diff) | |
| download | TV-485b7396c529b2b6c57e4f0a0dc3f5e62f6ff141.tar.gz | |
NPE at onContentBlocked in MainActivity.
PiperOrigin-RevId: 196874192
Change-Id: I8d2075a94fb9bfd3b108c32205e4d0a817da3e1a
| -rw-r--r-- | src/com/android/tv/MainActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/tv/ui/TunableTvView.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/tv/MainActivity.java b/src/com/android/tv/MainActivity.java index 4a33643f..0653a4f2 100644 --- a/src/com/android/tv/MainActivity.java +++ b/src/com/android/tv/MainActivity.java @@ -2849,7 +2849,7 @@ public class MainActivity extends Activity // before. if (mWasUnderShrunkenTvView && mUnlockAllowedRatingBeforeShrunken - && mChannelBeforeShrunkenTvView.equals(mChannel) + && Objects.equals(mChannelBeforeShrunkenTvView, mChannel) && rating.equals(mAllowedRatingBeforeShrunken)) { mUnlockAllowedRatingBeforeShrunken = isUnderShrunkenTvView(); mTvView.unblockContent(rating); diff --git a/src/com/android/tv/ui/TunableTvView.java b/src/com/android/tv/ui/TunableTvView.java index 40339286..9d8007d1 100644 --- a/src/com/android/tv/ui/TunableTvView.java +++ b/src/com/android/tv/ui/TunableTvView.java @@ -129,7 +129,7 @@ public class TunableTvView extends FrameLayout implements StreamInfo, TunableTvV private AppLayerTvView mTvView; private TvViewSession mTvViewSession; - private Channel mCurrentChannel; + @Nullable private Channel mCurrentChannel; private TvInputManagerHelper mInputManagerHelper; private ContentRatingsManager mContentRatingsManager; private ParentalControlSettings mParentalControlSettings; @@ -668,6 +668,7 @@ public class TunableTvView extends FrameLayout implements StreamInfo, TunableTvV } @Override + @Nullable public Channel getCurrentChannel() { return mCurrentChannel; } |