Merge branch 'dev' into separate-gesture-options

This commit is contained in:
Ritiek Malhotra
2018-09-05 09:21:05 -07:00
committed by GitHub
38 changed files with 1340 additions and 313 deletions
@@ -366,10 +366,7 @@ public abstract class BasePlayer implements
try {
context.unregisterReceiver(broadcastReceiver);
} catch (final IllegalArgumentException unregisteredException) {
ErrorActivity.reportError(context, unregisteredException, null, null,
ErrorActivity.ErrorInfo.make(PLAY_STREAM,
"none",
"play stream", R.string.general_error));
Log.e(TAG, "Broadcast receiver already unregistered.", unregisteredException);
}
}