Release then sync change listener onStop

ATV DevRel · chalko · commit b69087cc8ebf · 2017-07-17T19:55:29.000Z
This prevents leaking the fragement

PiperOrigin-RevId: 161958859
Change-Id: If2590396a6b63690d786d608d8d15adda18d22b1
diff --git a/app/src/main/java/com/example/android/sampletvinput/SampleJobService.java b/app/src/main/java/com/example/android/sampletvinput/SampleJobService.java
@@ -19,12 +19,12 @@
 import android.net.Uri;
 import com.example.android.sampletvinput.rich.RichFeedUtil;
 import com.google.android.exoplayer.util.Util;
-import com.google.android.media.tv.companionlibrary.xmltv.XmlTvParser;
 import com.google.android.media.tv.companionlibrary.ads.EpgSyncWithAdsJobService;
 import com.google.android.media.tv.companionlibrary.model.Advertisement;
 import com.google.android.media.tv.companionlibrary.model.Channel;
 import com.google.android.media.tv.companionlibrary.model.InternalProviderData;
 import com.google.android.media.tv.companionlibrary.model.Program;
+import com.google.android.media.tv.companionlibrary.xmltv.XmlTvParser;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/DashRendererBuilder.java b/app/src/main/java/com/example/android/sampletvinput/player/DashRendererBuilder.java
@@ -20,7 +20,6 @@
 import android.media.MediaCodec;
 import android.os.Handler;
 import android.util.Log;
-
 import com.google.android.exoplayer.DefaultLoadControl;
 import com.google.android.exoplayer.LoadControl;
 import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
@@ -51,7 +50,6 @@
 import com.google.android.exoplayer.upstream.UriDataSource;
 import com.google.android.exoplayer.util.ManifestFetcher;
 import com.google.android.exoplayer.util.Util;
-
 import java.io.IOException;
 
 /**
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/DemoPlayer.java b/app/src/main/java/com/example/android/sampletvinput/player/DemoPlayer.java
@@ -24,7 +24,6 @@
 import android.os.Looper;
 import android.support.annotation.RequiresApi;
 import android.view.Surface;
-
 import com.google.android.exoplayer.CodecCounters;
 import com.google.android.exoplayer.DummyTrackRenderer;
 import com.google.android.exoplayer.ExoPlaybackException;
@@ -51,7 +50,6 @@
 import com.google.android.exoplayer.util.DebugTextViewHelper;
 import com.google.android.exoplayer.util.PlayerControl;
 import com.google.android.media.tv.companionlibrary.TvPlayer;
-
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/ExtractorRendererBuilder.java b/app/src/main/java/com/example/android/sampletvinput/player/ExtractorRendererBuilder.java
@@ -20,7 +20,6 @@
 import android.media.AudioManager;
 import android.media.MediaCodec;
 import android.net.Uri;
-
 import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
 import com.google.android.exoplayer.MediaCodecSelector;
 import com.google.android.exoplayer.MediaCodecVideoTrackRenderer;
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/FakeTrickplayRunnable.java b/app/src/main/java/com/example/android/sampletvinput/player/FakeTrickplayRunnable.java
@@ -22,7 +22,6 @@
 import android.os.Looper;
 import android.support.annotation.RequiresApi;
 import android.util.Log;
-
 import com.google.android.media.tv.companionlibrary.TvPlayer;
 
 @RequiresApi(api = Build.VERSION_CODES.M)
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/HlsRendererBuilder.java b/app/src/main/java/com/example/android/sampletvinput/player/HlsRendererBuilder.java
@@ -20,7 +20,6 @@
 import android.media.AudioManager;
 import android.media.MediaCodec;
 import android.os.Handler;
-
 import com.google.android.exoplayer.DefaultLoadControl;
 import com.google.android.exoplayer.LoadControl;
 import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
@@ -46,7 +45,6 @@
 import com.google.android.exoplayer.upstream.DefaultUriDataSource;
 import com.google.android.exoplayer.util.ManifestFetcher;
 import com.google.android.exoplayer.util.ManifestFetcher.ManifestCallback;
-
 import java.io.IOException;
 import java.util.List;
 
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/RendererBuilderFactory.java b/app/src/main/java/com/example/android/sampletvinput/player/RendererBuilderFactory.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.net.Uri;
-
 import com.google.android.exoplayer.drm.MediaDrmCallback;
 import com.google.android.exoplayer.util.Util;
 import com.google.android.media.tv.companionlibrary.utils.TvContractUtils;
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/SmoothStreamingRendererBuilder.java b/app/src/main/java/com/example/android/sampletvinput/player/SmoothStreamingRendererBuilder.java
@@ -19,7 +19,6 @@
 import android.media.AudioManager;
 import android.media.MediaCodec;
 import android.os.Handler;
-
 import com.google.android.exoplayer.DefaultLoadControl;
 import com.google.android.exoplayer.LoadControl;
 import com.google.android.exoplayer.MediaCodecAudioTrackRenderer;
@@ -46,7 +45,6 @@
 import com.google.android.exoplayer.upstream.DefaultUriDataSource;
 import com.google.android.exoplayer.util.ManifestFetcher;
 import com.google.android.exoplayer.util.Util;
-
 import java.io.IOException;
 
 /**
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/SmoothStreamingTestMediaDrmCallback.java b/app/src/main/java/com/example/android/sampletvinput/player/SmoothStreamingTestMediaDrmCallback.java
@@ -17,13 +17,11 @@
 
 import android.annotation.TargetApi;
 import android.text.TextUtils;
-
 import com.google.android.exoplayer.drm.ExoMediaDrm.KeyRequest;
 import com.google.android.exoplayer.drm.ExoMediaDrm.ProvisionRequest;
 import com.google.android.exoplayer.drm.MediaDrmCallback;
 import com.google.android.exoplayer.drm.StreamingDrmSessionManager;
 import com.google.android.exoplayer.util.Util;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/app/src/main/java/com/example/android/sampletvinput/player/WidevineTestMediaDrmCallback.java b/app/src/main/java/com/example/android/sampletvinput/player/WidevineTestMediaDrmCallback.java
@@ -21,7 +21,6 @@
 import com.google.android.exoplayer.drm.ExoMediaDrm.ProvisionRequest;
 import com.google.android.exoplayer.drm.MediaDrmCallback;
 import com.google.android.exoplayer.util.Util;
-
 import java.io.IOException;
 import java.util.UUID;
 
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkDetailsActivity.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkDetailsActivity.java
@@ -18,7 +18,6 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-
 import com.example.android.sampletvinput.R;
 
 public class RichAppLinkDetailsActivity extends Activity {
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkDetailsFragment.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkDetailsFragment.java
@@ -31,7 +31,6 @@
 import android.support.v17.leanback.widget.ListRowPresenter;
 import android.support.v17.leanback.widget.OnActionClickedListener;
 import android.support.v4.content.ContextCompat;
-
 import com.example.android.sampletvinput.R;
 
 /**
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkSidePanelActivity.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichAppLinkSidePanelActivity.java
@@ -25,11 +25,9 @@
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.TextView;
-
 import com.example.android.sampletvinput.R;
 import com.google.android.media.tv.companionlibrary.model.Channel;
 import com.google.android.media.tv.companionlibrary.model.ModelUtils;
-
 import java.util.List;
 
 /**
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichBootReceiver.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichBootReceiver.java
@@ -23,10 +23,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-
 import com.example.android.sampletvinput.SampleJobService;
 import com.google.android.media.tv.companionlibrary.sync.EpgSyncJobService;
-
 import java.util.List;
 
 /**
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichFeedUtil.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichFeedUtil.java
@@ -20,10 +20,8 @@
 import android.content.Context;
 import android.net.Uri;
 import android.util.Log;
-
 import com.example.android.sampletvinput.R;
 import com.google.android.media.tv.companionlibrary.xmltv.XmlTvParser;
-
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/app/src/main/java/com/example/android/sampletvinput/rich/RichTvInputService.java b/app/src/main/java/com/example/android/sampletvinput/rich/RichTvInputService.java
@@ -35,27 +35,24 @@
 import android.view.View;
 import android.view.WindowManager;
 import android.view.accessibility.CaptioningManager;
-
 import com.example.android.sampletvinput.R;
+import com.example.android.sampletvinput.SampleJobService;
 import com.example.android.sampletvinput.player.DemoPlayer;
 import com.example.android.sampletvinput.player.RendererBuilderFactory;
-
-import com.example.android.sampletvinput.SampleJobService;
 import com.google.android.exoplayer.ExoPlayer;
 import com.google.android.exoplayer.MediaFormat;
 import com.google.android.exoplayer.text.CaptionStyleCompat;
 import com.google.android.exoplayer.text.Cue;
 import com.google.android.exoplayer.text.SubtitleLayout;
+import com.google.android.media.tv.companionlibrary.BaseTvInputService;
 import com.google.android.media.tv.companionlibrary.TvPlayer;
 import com.google.android.media.tv.companionlibrary.model.Advertisement;
 import com.google.android.media.tv.companionlibrary.model.Channel;
 import com.google.android.media.tv.companionlibrary.model.InternalProviderData;
 import com.google.android.media.tv.companionlibrary.model.Program;
 import com.google.android.media.tv.companionlibrary.model.RecordedProgram;
-import com.google.android.media.tv.companionlibrary.BaseTvInputService;
 import com.google.android.media.tv.companionlibrary.sync.EpgSyncJobService;
 import com.google.android.media.tv.companionlibrary.utils.TvContractUtils;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/ChannelSetupFragmentTest.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/ChannelSetupFragmentTest.java
@@ -29,14 +29,11 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-
 import com.google.android.media.tv.companionlibrary.setup.ChannelSetupFragment;
 import com.google.android.media.tv.companionlibrary.sync.EpgSyncJobService;
-
-import junit.framework.Assert;
-
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import junit.framework.Assert;
 
 public class ChannelSetupFragmentTest extends ActivityInstrumentationTestCase2<TestActivity> {
     private static final String TAG = ChannelSetupFragmentTest.class.getSimpleName();
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/MockTvPlayer.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/MockTvPlayer.java
@@ -21,12 +21,9 @@
 import android.os.Build;
 import android.support.annotation.RequiresApi;
 import android.view.Surface;
-
 import com.google.android.media.tv.companionlibrary.TvPlayer;
-
-import junit.framework.Assert;
-
 import java.io.IOException;
+import junit.framework.Assert;
 
 /**
  * The MockTvPlayer is an implementation of TvPlayer which plays media with Android's MediaPlayer.
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/PeriodicEpgSyncJobServiceTest.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/PeriodicEpgSyncJobServiceTest.java
@@ -28,20 +28,16 @@
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 import android.util.LongSparseArray;
-
 import com.google.android.media.tv.companionlibrary.model.Channel;
 import com.google.android.media.tv.companionlibrary.model.ModelUtils;
 import com.google.android.media.tv.companionlibrary.model.Program;
 import com.google.android.media.tv.companionlibrary.sync.EpgSyncJobService;
-
-import junit.framework.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import junit.framework.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Tests the periodic syncing functionality of the EpgSyncJobService to ensure the reliability of
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/TestJobService.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/TestJobService.java
@@ -18,12 +18,12 @@
 import android.content.Context;
 import android.net.Uri;
 import android.support.annotation.VisibleForTesting;
-import com.google.android.media.tv.companionlibrary.xmltv.XmlTvParser;
 import com.google.android.media.tv.companionlibrary.ads.EpgSyncWithAdsJobService;
 import com.google.android.media.tv.companionlibrary.model.Channel;
 import com.google.android.media.tv.companionlibrary.model.InternalProviderData;
 import com.google.android.media.tv.companionlibrary.model.Program;
 import com.google.android.media.tv.companionlibrary.utils.TvContractUtils;
+import com.google.android.media.tv.companionlibrary.xmltv.XmlTvParser;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.util.ArrayList;
diff --git a/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/TestTvInputService.java b/library/src/androidTest/java/com/google/android/media/tv/companionlibrary/test/TestTvInputService.java
@@ -24,16 +24,13 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.util.Log;
-
 import com.google.android.media.tv.companionlibrary.BaseTvInputService;
 import com.google.android.media.tv.companionlibrary.TvPlayer;
 import com.google.android.media.tv.companionlibrary.model.Channel;
 import com.google.android.media.tv.companionlibrary.model.Program;
 import com.google.android.media.tv.companionlibrary.model.RecordedProgram;
-
-import junit.framework.Assert;
-
 import java.io.IOException;
+import junit.framework.Assert;
 
 /**
  * Dummy TvInputService that may be called for testing purposes
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/setup/ChannelSetupStepSupportFragment.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/setup/ChannelSetupStepSupportFragment.java
@@ -103,6 +103,13 @@ public void onStart() {
         startScan();
     }
 
+    @Override
+    public void onStop() {
+        super.onStop();
+        LocalBroadcastManager.getInstance(getActivity())
+            .unregisterReceiver(mSyncStatusChangedReceiver);
+    }
+
     private void startScan() {
         EpgSyncJobService.cancelAllSyncRequests(getContext());
         EpgSyncJobService.requestImmediateSync(
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/utils/CollectionUtils.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/utils/CollectionUtils.java
@@ -16,6 +16,7 @@
 package com.google.android.media.tv.companionlibrary.utils;
 
 import java.util.Arrays;
+
 /** Static utilities for collections */
 public class CollectionUtils {
     /**
diff --git a/library/src/main/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvParser.java b/library/src/main/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvParser.java
@@ -5,7 +5,7 @@
  * 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
+ * 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,
diff --git a/library/src/test/java/com/google/android/media/tv/companionlibrary/model/AdvertisementTest.java b/library/src/test/java/com/google/android/media/tv/companionlibrary/model/AdvertisementTest.java
@@ -16,19 +16,17 @@
 
 package com.google.android.media.tv.companionlibrary.model;
 
-import com.google.android.media.tv.companionlibrary.BuildConfig;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import com.google.android.media.tv.companionlibrary.BuildConfig;
 import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
 
 /**
  * Test {@link Advertisement} can be properly generated with builder pattern, copied from another
diff --git a/library/src/test/java/com/google/android/media/tv/companionlibrary/model/InternalProviderDataTest.java b/library/src/test/java/com/google/android/media/tv/companionlibrary/model/InternalProviderDataTest.java
@@ -27,7 +27,6 @@
 import org.robolectric.RobolectricGradleTestRunner;
 import java.util.ArrayList;
 import junit.framework.Assert;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.annotation.Config;
diff --git a/library/src/test/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvAdvertisementTest.java b/library/src/test/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvAdvertisementTest.java
@@ -16,24 +16,22 @@
 
 package com.google.android.media.tv.companionlibrary.xmltv;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.fail;
+
 import com.google.android.media.tv.companionlibrary.BuildConfig;
 import com.google.android.media.tv.companionlibrary.model.Advertisement;
 import com.google.android.media.tv.companionlibrary.model.Channel;
 import com.google.android.media.tv.companionlibrary.model.InternalProviderData;
 import com.google.android.media.tv.companionlibrary.model.Program;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.robolectric.RobolectricGradleTestRunner;
-import org.robolectric.annotation.Config;
-
 import java.io.InputStream;
 import java.text.ParseException;
 import java.util.List;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.fail;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricGradleTestRunner.class)
 @Config(constants = BuildConfig.class, sdk = 21, manifest = "src/main/AndroidManifest.xml")
diff --git a/library/src/test/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvParserTest.java b/library/src/test/java/com/google/android/media/tv/companionlibrary/xmltv/XmlTvParserTest.java
