sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tidy up naming

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=195351640
This commit is contained in:
olly 2018-05-03 18:48:48 -07:00 committed by Oliver Woodman
parent fdbea33a14
commit e697322620
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
View file

@ -339,17 +339,17 @@ public final class DownloadManager {
continue; continue;
} }
DownloadAction downloadAction = task.action; DownloadAction action = task.action;
boolean removeAction = downloadAction.isRemoveAction; boolean isRemoveAction = action.isRemoveAction;
if (!removeAction && skipDownloadActions) { if (!isRemoveAction && skipDownloadActions) {
continue; continue;
} }
boolean canStartTask = true; boolean canStartTask = true;
for (int j = 0; j < i; j++) { for (int j = 0; j < i; j++) {
Task otherTask = tasks.get(j); Task otherTask = tasks.get(j);
if (otherTask.action.isSameMedia(downloadAction)) { if (otherTask.action.isSameMedia(action)) {
if (removeAction) { if (isRemoveAction) {
canStartTask = false; canStartTask = false;
logd(task + " clashes with " + otherTask); logd(task + " clashes with " + otherTask);
otherTask.cancel(); otherTask.cancel();
@ -364,7 +364,7 @@ public final class DownloadManager {
if (canStartTask) { if (canStartTask) {
task.start(); task.start();
if (!removeAction) { if (!isRemoveAction) {
activeDownloadTasks.add(task); activeDownloadTasks.add(task);
skipDownloadActions = activeDownloadTasks.size() == maxActiveDownloadTasks; skipDownloadActions = activeDownloadTasks.size() == maxActiveDownloadTasks;
} }