Merge pull request #885 from AltBeacon/fix-unbound-thread-leak

Fix thread leak caused by scheduling ScanJob when no consumers bound

CHANGELOG.md

@@ -1,6 +1,7 @@
 ### Development
 
 Bug Fixes:
+- Fix thread leak caused by scheduling ScanJob when no consumers bound. (#885, David G. Young)
 - Protect against a NPE when changing ranged regions.  (#770, David G. Young)
 - Fix intermittent failed ranging/monitoring callbacks in race conditions. (#842, David G. Young) 
 - Prevent duplicate callbacks on Android 8+ with a foreground service by stopping ScanJob.  (#847, Stephen Ruda)

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

@@ -581,6 +581,7 @@ public void setBackgroundMode(boolean backgroundMode) {
      *
      * @param enabled
      */
+
     public void setEnableScheduledScanJobs(boolean enabled) {
         if (isAnyConsumerBound()) {
             LogManager.e(TAG, "ScanJob may not be configured because a consumer is" +
@@ -998,15 +999,16 @@ public void updateScanPeriods() throws RemoteException {
 
     @TargetApi(18)
     private void applyChangesToServices(int type, Region region) throws RemoteException {
+        if (!isAnyConsumerBound()) {
+            LogManager.w(TAG, "The BeaconManager is not bound to the service.  Call beaconManager.bind(BeaconConsumer consumer) and wait for a callback to onBeaconServiceConnect()");
+            return;
+        }
         if (mScheduledScanJobsEnabled) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                 ScanJobScheduler.getInstance().applySettingsToScheduledJob(mContext, this);
             }
             return;
         }
-        if (serviceMessenger == null) {
-            throw new RemoteException("The BeaconManager is not bound to the service.  Call beaconManager.bind(BeaconConsumer consumer) and wait for a callback to onBeaconServiceConnect()");
-        }
         Message msg = Message.obtain(null, type, 0, 0);
         if (type == BeaconService.MSG_SET_SCAN_PERIODS) {
             msg.setData(new StartRMData(this.getScanPeriod(), this.getBetweenScanPeriod(), this.mBackgroundMode).toBundle());