Skip to content

Commit 3e72891

Browse files
authored
Merge pull request #1230 from elican-doenyas/bugfix/ISSUE-1221-update-bg-scan-periods
ISSUE#1221: Use correct scanning parameters for bg scan
2 parents ae42a78 + 100f354 commit 3e72891

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/src/main/java/org/altbeacon/beacon/BeaconManager.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ private void applySettingsChange(AppliedSettings newSettings) {
255255
BeaconManager.setDistanceModelUpdateUrl(Objects.requireNonNull(settings.getDistanceModelUpdateUrl()));
256256

257257
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
258-
if (settings.getScanPeriods().getBackgroundScanPeriodMillis() < 15*60*1000 /* 15 min */ &&
258+
if (settings.getScanPeriods().getBackgroundBetweenScanPeriodMillis() < 15*60*1000 /* 15 min */ &&
259259
settings.getScanStrategy() instanceof Settings.JobServiceScanStrategy) {
260260
LogManager.w(TAG, "Setting a short backgroundBetweenScanPeriod has no effect on "+
261261
"Android 8+, which is limited to scanning every ~15 minutes");
@@ -275,7 +275,7 @@ private void applySettingsChange(AppliedSettings newSettings) {
275275
BeaconManager.setDebug(Boolean.TRUE.equals(settings.getDebug()));
276276
Settings.ScanPeriods sp = settings.getScanPeriods();
277277
if (sp != null) {
278-
setBackgroundBetweenScanPeriod(sp.getBackgroundScanPeriodMillis());
278+
setBackgroundBetweenScanPeriod(sp.getBackgroundBetweenScanPeriodMillis());
279279
setBackgroundScanPeriod(sp.getBackgroundScanPeriodMillis());
280280
setForegroundBetweenScanPeriod(sp.getForegroundBetweenScanPeriodMillis());
281281
setForegroundScanPeriod(sp.getForegroundScanPeriodMillis());

lib/src/main/java/org/altbeacon/beacon/Settings.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ data class Settings(
207207
val foregroundScanPeriodMillis: Long = 1100,
208208
val foregroundBetweenScanPeriodMillis: Long = 0,
209209
val backgroundScanPeriodMillis: Long = 30000,
210-
val backgroundBetweenScanPeriodMillis: Long = 0
210+
val backgroundBetweenScanPeriodMillis: Long = 300000
211211
)
212212
interface ScanStrategy: Comparable<ScanStrategy> {
213213
fun clone(): ScanStrategy

0 commit comments

Comments
 (0)