Removed some no longer needed logs.
This commit is contained in:
parent
293600ba0d
commit
13c4e86c7d
3 changed files with 0 additions and 19 deletions
|
|
@ -21,8 +21,6 @@ import java.util.ArrayList;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.WeakHashMap;
|
import java.util.WeakHashMap;
|
||||||
|
|
||||||
import hugo.weaving.DebugLog;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Karim Abou Zeid (kabouzeid)
|
* @author Karim Abou Zeid (kabouzeid)
|
||||||
*/
|
*/
|
||||||
|
|
@ -35,7 +33,6 @@ public class MusicPlayerRemote {
|
||||||
|
|
||||||
private static final WeakHashMap<Context, ServiceBinder> mConnectionMap = new WeakHashMap<>();
|
private static final WeakHashMap<Context, ServiceBinder> mConnectionMap = new WeakHashMap<>();
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
public static ServiceToken bindToService(@NonNull final Context context,
|
public static ServiceToken bindToService(@NonNull final Context context,
|
||||||
final ServiceConnection callback) {
|
final ServiceConnection callback) {
|
||||||
Activity realActivity = ((Activity) context).getParent();
|
Activity realActivity = ((Activity) context).getParent();
|
||||||
|
|
@ -55,7 +52,6 @@ public class MusicPlayerRemote {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
public static void unbindFromService(@Nullable final ServiceToken token) {
|
public static void unbindFromService(@Nullable final ServiceToken token) {
|
||||||
if (token == null) {
|
if (token == null) {
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -58,8 +58,6 @@ import java.lang.ref.WeakReference;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import hugo.weaving.DebugLog;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Karim Abou Zeid (kabouzeid), Andrew Neal
|
* @author Karim Abou Zeid (kabouzeid), Andrew Neal
|
||||||
*/
|
*/
|
||||||
|
|
@ -156,7 +154,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
|
||||||
return MusicUtil.getSongFileUri(song.id).toString();
|
return MusicUtil.getSongFileUri(song.id).toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
@Override
|
@Override
|
||||||
public void onCreate() {
|
public void onCreate() {
|
||||||
super.onCreate();
|
super.onCreate();
|
||||||
|
|
@ -231,7 +228,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
|
||||||
getAudioManager().registerRemoteControlClient(remoteControlClient);
|
getAudioManager().registerRemoteControlClient(remoteControlClient);
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
@Override
|
@Override
|
||||||
public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
|
public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
|
||||||
if (intent != null) {
|
if (intent != null) {
|
||||||
|
|
@ -268,7 +264,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
|
||||||
return START_STICKY;
|
return START_STICKY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy() {
|
public void onDestroy() {
|
||||||
quit();
|
quit();
|
||||||
|
|
@ -278,20 +273,17 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
|
||||||
wakeLock.release();
|
wakeLock.release();
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
@Override
|
@Override
|
||||||
public IBinder onBind(Intent intent) {
|
public IBinder onBind(Intent intent) {
|
||||||
isServiceBound = true;
|
isServiceBound = true;
|
||||||
return musicBind;
|
return musicBind;
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
@Override
|
@Override
|
||||||
public void onRebind(Intent intent) {
|
public void onRebind(Intent intent) {
|
||||||
isServiceBound = true;
|
isServiceBound = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onUnbind(Intent intent) {
|
public boolean onUnbind(Intent intent) {
|
||||||
isServiceBound = false;
|
isServiceBound = false;
|
||||||
|
|
@ -365,7 +357,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
|
||||||
playerHandler.sendEmptyMessage(RESTORE_QUEUES);
|
playerHandler.sendEmptyMessage(RESTORE_QUEUES);
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
private void restoreQueuesAndPositionImpl() {
|
private void restoreQueuesAndPositionImpl() {
|
||||||
ArrayList<Song> restoredQueue = MusicPlaybackQueueStore.getInstance(this).getSavedPlayingQueue();
|
ArrayList<Song> restoredQueue = MusicPlaybackQueueStore.getInstance(this).getSavedPlayingQueue();
|
||||||
ArrayList<Song> restoredOriginalQueue = MusicPlaybackQueueStore.getInstance(this).getSavedOriginalPlayingQueue();
|
ArrayList<Song> restoredOriginalQueue = MusicPlaybackQueueStore.getInstance(this).getSavedOriginalPlayingQueue();
|
||||||
|
|
@ -901,20 +892,17 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
|
||||||
notifyChange(QUEUE_CHANGED);
|
notifyChange(QUEUE_CHANGED);
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
private void notifyChange(@NonNull final String what) {
|
private void notifyChange(@NonNull final String what) {
|
||||||
notifyPrivateChange(what);
|
notifyPrivateChange(what);
|
||||||
sendPublicIntent(what);
|
sendPublicIntent(what);
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
private void notifyPrivateChange(@NonNull final String what) {
|
private void notifyPrivateChange(@NonNull final String what) {
|
||||||
handleChange(what);
|
handleChange(what);
|
||||||
sendPrivateIntent(what);
|
sendPrivateIntent(what);
|
||||||
}
|
}
|
||||||
|
|
||||||
// to let other apps know whats playing. i.E. last.fm (scrobbling) or musixmatch
|
// to let other apps know whats playing. i.E. last.fm (scrobbling) or musixmatch
|
||||||
@DebugLog
|
|
||||||
private void sendPublicIntent(@NonNull final String what) {
|
private void sendPublicIntent(@NonNull final String what) {
|
||||||
final Intent intent = new Intent(what.replace(PHONOGRAPH_PACKAGE_NAME, MUSIC_PACKAGE_NAME));
|
final Intent intent = new Intent(what.replace(PHONOGRAPH_PACKAGE_NAME, MUSIC_PACKAGE_NAME));
|
||||||
|
|
||||||
|
|
@ -931,7 +919,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
|
||||||
sendStickyBroadcast(intent);
|
sendStickyBroadcast(intent);
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
private void sendPrivateIntent(final String what) {
|
private void sendPrivateIntent(final String what) {
|
||||||
sendBroadcast(new Intent(what));
|
sendBroadcast(new Intent(what));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,6 @@ public abstract class AbsMusicServiceActivity extends AbsBaseActivity implements
|
||||||
private boolean receiverRegistered;
|
private boolean receiverRegistered;
|
||||||
|
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
@ -54,7 +53,6 @@ public abstract class AbsMusicServiceActivity extends AbsBaseActivity implements
|
||||||
setPermissionDeniedMessage(getString(R.string.permission_external_storage_denied));
|
setPermissionDeniedMessage(getString(R.string.permission_external_storage_denied));
|
||||||
}
|
}
|
||||||
|
|
||||||
@DebugLog
|
|
||||||
@Override
|
@Override
|
||||||
protected void onDestroy() {
|
protected void onDestroy() {
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue