Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 14:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into '1142-wakeful-tasks'

Browse Source 
# Conflicts:
#   bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java
This commit is contained in:
akwizgran
2020-08-10 12:37:50 +00:00
parent eac93f43d3 b0bf9d5a8c
commit b5bb4aff7f
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java
View File

@@ -120,7 +120,7 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
LOG.info("Alarm"); LOG.info("Alarm");
rescheduleAlarm(); rescheduleAlarm();
runDueTasks(); runDueTasks();
} else { } else if (LOG.isLoggable(INFO)) {
LOG.info("Ignoring alarm with PID " + extraPid LOG.info("Ignoring alarm with PID " + extraPid
+ ", current PID is " + currentPid); + ", current PID is " + currentPid);
} }
@@ -154,6 +154,7 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
} }
private void rescheduleAlarm() { private void rescheduleAlarm() {
// If SDK_INT < 23 the alarm repeats automatically
if (SDK_INT >= 23) scheduleIdleAlarm(); if (SDK_INT >= 23) scheduleIdleAlarm();
} }

2
bramble-android/src/main/java/org/briarproject/bramble/system/AndroidWakeLockManagerImpl.java
View File

@@ -13,7 +13,6 @@ import org.briarproject.bramble.api.system.AndroidWakeLockManager;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.concurrent.Immutable;
import javax.inject.Inject; import javax.inject.Inject;
import static android.content.Context.POWER_SERVICE; import static android.content.Context.POWER_SERVICE;
@@ -22,7 +21,6 @@ import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.concurrent.TimeUnit.SECONDS;
import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull; import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
@Immutable
@NotNullByDefault @NotNullByDefault
class AndroidWakeLockManagerImpl implements AndroidWakeLockManager { class AndroidWakeLockManagerImpl implements AndroidWakeLockManager {