Merge pull request #1166 from TomHennen/api22

Update to API 22

1 files changed, 0 insertions, 62 deletions

diff --git a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
index 42fa84d20..4ee372d68 100644
--- a/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/service/playback/PlaybackServiceMediaPlayerTest.java
@@ -188,10 +188,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
                 return false;
             }
 
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         Playable p = writeTestPlayable(PLAYABLE_FILE_URL, null);
@@ -260,11 +256,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             public boolean endPlayback(boolean playNextEpisode) {
                 return false;
             }
-
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         Playable p = writeTestPlayable(PLAYABLE_FILE_URL, null);
@@ -337,11 +328,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             public boolean endPlayback(boolean playNextEpisode) {
                 return false;
             }
-
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         Playable p = writeTestPlayable(PLAYABLE_FILE_URL, null);
@@ -416,10 +402,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
                 return false;
             }
 
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         Playable p = writeTestPlayable(PLAYABLE_FILE_URL, null);
@@ -487,10 +469,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
                 return false;
             }
 
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         Playable p = writeTestPlayable(PLAYABLE_FILE_URL, PLAYABLE_LOCAL_URL);
@@ -558,11 +536,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             public boolean endPlayback(boolean playNextEpisode) {
                 return false;
             }
-
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         Playable p = writeTestPlayable(PLAYABLE_FILE_URL, PLAYABLE_LOCAL_URL);
@@ -633,11 +606,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             public boolean endPlayback(boolean playNextEpisode) {
                 return false;
             }
-
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         Playable p = writeTestPlayable(PLAYABLE_FILE_URL, PLAYABLE_LOCAL_URL);
@@ -711,11 +679,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             public boolean endPlayback(boolean playNextEpisode) {
                 return false;
             }
-
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         Playable p = writeTestPlayable(PLAYABLE_FILE_URL, PLAYABLE_LOCAL_URL);
@@ -764,11 +727,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
         public boolean endPlayback(boolean playNextEpisode) {
             return false;
         }
-
-        @Override
-        public RemoteControlClient getRemoteControlClient() {
-            return null;
-        }
     };
 
     private void pauseTestSkeleton(final PlayerStatus initialState, final boolean stream, final boolean abandonAudioFocus, final boolean reinit, long timeoutSeconds) throws InterruptedException {
@@ -841,11 +799,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             public boolean endPlayback(boolean playNextEpisode) {
                 return false;
             }
-
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         Playable p = writeTestPlayable(PLAYABLE_FILE_URL, PLAYABLE_LOCAL_URL);
@@ -952,11 +905,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             public boolean endPlayback(boolean playNextEpisode) {
                 return false;
             }
-
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         if (initialState == PlayerStatus.PREPARED || initialState == PlayerStatus.PLAYING || initialState == PlayerStatus.PAUSED) {
@@ -1038,11 +986,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             public boolean endPlayback(boolean playNextEpisode) {
                 return false;
             }
-
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         Playable p = writeTestPlayable(PLAYABLE_FILE_URL, PLAYABLE_LOCAL_URL);
@@ -1137,11 +1080,6 @@ public class PlaybackServiceMediaPlayerTest extends InstrumentationTestCase {
             public boolean endPlayback(boolean playNextEpisode) {
                 return false;
             }
-
-            @Override
-            public RemoteControlClient getRemoteControlClient() {
-                return null;
-            }
         };
         PlaybackServiceMediaPlayer psmp = new PlaybackServiceMediaPlayer(c, callback);
         Playable p = writeTestPlayable(PLAYABLE_FILE_URL, PLAYABLE_LOCAL_URL);