Commit b5bb4aff authored by akwizgran's avatar akwizgran
Browse files

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

# Conflicts:
#   bramble-android/src/main/java/org/briarproject/bramble/system/AndroidTaskScheduler.java
parents eac93f43 b0bf9d5a
Pipeline #4690 passed with stage
in 8 minutes and 49 seconds
......@@ -120,7 +120,7 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
LOG.info("Alarm");
rescheduleAlarm();
runDueTasks();
} else {
} else if (LOG.isLoggable(INFO)) {
LOG.info("Ignoring alarm with PID " + extraPid
+ ", current PID is " + currentPid);
}
......@@ -154,6 +154,7 @@ class AndroidTaskScheduler implements TaskScheduler, Service, AlarmListener {
}
private void rescheduleAlarm() {
// If SDK_INT < 23 the alarm repeats automatically
if (SDK_INT >= 23) scheduleIdleAlarm();
}
......
......@@ -13,7 +13,6 @@ import org.briarproject.bramble.api.system.AndroidWakeLockManager;
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.concurrent.Immutable;
import javax.inject.Inject;
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 org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
@Immutable
@NotNullByDefault
class AndroidWakeLockManagerImpl implements AndroidWakeLockManager {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment